Commit Graph

170 Commits

Author SHA1 Message Date
f08f24b95d Merge branch 'stable-1.1' 2019-11-03 12:41:21 +01:00
8a432103f2 Merge branch 'stable-1.0' into stable-1.1 2019-11-03 12:40:50 +01:00
6aa0fb5944 Supprime la branche nalc de plusieurs sous-modules
interact, inventorycheck, irc_commands, item_drop
2019-11-03 12:38:11 +01:00
4cc8591d29 Merge branch 'stable-1.1' 2019-11-03 12:20:50 +01:00
28cdbfd765 Merge branch 'stable-1.0' into stable-1.1 2019-11-03 12:20:26 +01:00
da32453b92 Supprime la branche nalc de plusieurs sous-modules
h2omes, hazmat_suit, hbarmor, hbhunger, hbsprint, hudbars
2019-11-03 12:16:38 +01:00
2c8b6bc0d8 Merge branch 'stable-1.1' 2019-11-03 11:46:50 +01:00
c354035b97 Merge branch 'stable-1.0' into stable-1.1 2019-11-03 11:46:14 +01:00
50b07c05f9 Supprime la branche nalc de plusieurs sous-modules
gauges, glow
2019-11-03 11:41:34 +01:00
aef8d26654 Merge branch 'stable-1.1' 2019-11-03 11:26:13 +01:00
e740f02aa5 Merge branch 'stable-1.0' into stable-1.1 2019-11-03 11:25:27 +01:00
956bc170f3 Supprime la branche nalc de plusieurs sous-modules
fail, farming, fishing, food, food_sweet, framedglass
2019-11-03 11:18:21 +01:00
e26c6106e5 Merge branch 'stable-1.1' 2019-11-03 10:47:11 +01:00
02ef7582c8 Merge branch 'stable-1.0' into stable-1.1 2019-11-03 10:46:54 +01:00
e39aedb019 Supprime la branche nalc de plusieurs sous-modules
enchanting, exchange_shop
2019-11-03 10:46:09 +01:00
dd7428732e Merge branch 'stable-1.1' 2019-11-03 08:58:31 +01:00
438f3fa1db Merge branch 'stable-1.0' into stable-1.1 2019-11-03 08:58:06 +01:00
a5a9635323 Supprime la branche nalc de plusieurs sous-modules
darkage, death_messages, diet, digilines
2019-11-03 08:53:17 +01:00
64f16f1a46 Merge branch 'stable-1.1' 2019-11-02 17:44:49 +01:00
343f9e2109 Merge branch 'stable-1.0' into stable-1.1 2019-11-02 17:44:16 +01:00
00420b2ce5 Supprime la branche nalc de plusieurs sous-modules
chritmas_craft, claycrafter, coloredwood, colouredstonebricks,
columnia, cozy, craftguide, creeper
2019-11-02 17:42:06 +01:00
50546a3563 Merge branch 'stable-1.1' 2019-11-02 16:46:02 +01:00
c353db79df Merge branch 'stable-1.0' into stable-1.1 2019-11-02 16:45:48 +01:00
6a382f09f8 Supprime la branche du sous-module chesttools 2019-11-02 16:45:04 +01:00
354e5121ca Merge branch 'stable-1.1' 2019-11-02 16:27:26 +01:00
1600976dde Merge branch 'stable-1.0' into stable-1.1 2019-11-02 16:26:52 +01:00
b2ec05abcf Modifie l'url et supprime les branches de plusieurs sous-modules
bakedclay, banners, biome_lib, bitchange, bobblocks, bonemeal,
boost_cart, broomstick
2019-11-02 16:24:51 +01:00
27981fd49f Merge branch 'stable-1.1' 2019-11-02 15:22:00 +01:00
d6ab66485f Merge branch 'stable-1.0' into stable-1.1 2019-11-02 15:20:15 +01:00
6653136d8e Supprime les branches de plusieurs sous-modules
armor_monoid, arrow_signs
2019-11-02 15:18:43 +01:00
2ae61ae2e7 [3d_armor_calsses] Supprime la branche du submodule 2019-10-12 18:13:29 +02:00
c527f08530 Merge branch 'stable-1.1' 2019-10-12 15:22:42 +02:00
c0b76d902b Merge branch 'stable-1.0' into stable-1.1 2019-10-12 15:22:15 +02:00
fbb09f1a94 [3d_armor] Le submodule pointe vers la branche nalc-1.0 2019-10-12 14:57:02 +02:00
f47c65c28d Merge branch 'stable-1.1' 2019-10-11 20:22:00 +02:00
18a9fb0279 Merge branch 'stable-1.0' into stable-1.1 2019-10-11 20:21:41 +02:00
e8421cb137 [warps] Le submodule pointe vers un commit spécifique 2019-10-11 20:12:11 +02:00
sys4-fr
2fa9fa828c Merge branch 'stable-1.1' 2019-09-29 15:44:08 +02:00
sys4-fr
b7f882c9a2 Merge branch 'stable-1.0' into stable-1.1 2019-09-29 15:43:33 +02:00
sys4-fr
15665080bb [vector_extras] Change url submodule
et pointe vers la branche master
2019-09-29 15:42:19 +02:00
eceb77c247 Merge branch 'stable-1.1' 2019-09-29 11:00:17 +02:00
d2a9d200eb Merge branch 'stable-1.0' into stable-1.1 2019-09-29 10:59:56 +02:00
95ac273fd9 [unifiedwool] Change url submodule
Et pointe vers la branche master
2019-09-29 10:59:21 +02:00
a5a0da2e92 Merge branch 'stable-1.1' 2019-09-29 10:37:36 +02:00
456684653b Merge branch 'stable-1.0' into stable-1.1 2019-09-29 10:37:02 +02:00
05312fb246 [unifieddyes] Change url submodule
Et la branche pointe vers une révision fixe
2019-09-29 10:27:49 +02:00
15fa32262c Merge branch 'stable-1.1' 2019-09-29 00:35:18 +02:00
871f58c92d Merge branch 'stable-1.0' into stable-1.1 2019-09-29 00:34:56 +02:00
9284f7fcd6 [u_skins] Change url submodule 2019-09-29 00:34:26 +02:00
1e6b3cb661 Merge branch 'stable-1.1' 2019-09-28 23:29:14 +02:00