Commit Graph

233 Commits

Author SHA1 Message Date
406256ca85 Merge branch 'stable-1.1' 2019-12-07 13:53:18 +01:00
ea4d1f3510 Merge branch 'stable-1.0' into stable-1.1 2019-12-07 13:52:52 +01:00
b99ab055af Supprime la branche nalc de plusieurs sous-modules
toolranks, global_exchange, email, tsm_pyramids, homedecor_modpack, nalc
2019-12-07 13:50:22 +01:00
8752e0db6e Merge branch 'stable-1.1' 2019-12-07 13:18:05 +01:00
5f3c260f48 Merge branch 'stable-1.0' into stable-1.1 2019-12-07 13:17:24 +01:00
14cc4391f8 Supprime la branche nalc de plusieurs sous-modules
camera, invtweak, inventory_icon, pipeworks, awards
2019-12-07 13:16:19 +01:00
b81ee9e896 Merge branch 'stable-1.1' 2019-12-06 22:16:39 +01:00
6a1f5f9acd Merge branch 'stable-1.0' into stable-1.1 2019-12-06 22:16:26 +01:00
da20253683 Supprime la branche nalc de plusieurs sous-modules
colddb, factions, plantlife_modpack
2019-12-06 22:14:06 +01:00
0c9baff518 Merge branch 'stable-1.1' 2019-12-06 21:54:06 +01:00
0f588976b7 Merge branch 'stable-1.0' into stable-1.1 2019-12-06 21:53:50 +01:00
ca3e5953ce Supprime la branche nalc de plusieurs sous-modules
sea, slimes, nether
2019-12-06 21:52:12 +01:00
c12372fcfc Merge branch 'stable-1.1' 2019-12-06 19:56:33 +01:00
4e7cd4d2c5 Merge branch 'stable-1.0' into stable-1.1 2019-12-06 19:56:24 +01:00
9f6a6bd03b Supprime la branche nalc de plusieurs sous-modules
connected_chests, quartz, cherry_tree
2019-12-06 19:55:27 +01:00
289a91dacf Merge branch 'stable-1.1' 2019-12-06 19:35:36 +01:00
9abea0e8e3 Merge branch 'stable-1.0' into stable-1.1 2019-12-06 19:35:25 +01:00
00fe631d1a Supprime la branche nalc de plusieurs sous-modules
xban2, zombie
2019-12-06 19:34:44 +01:00
f41070d49e Merge branch 'stable-1.1' 2019-12-06 19:23:39 +01:00
640342035b Merge branch 'stable-1.0' into stable-1.1 2019-12-06 19:23:25 +01:00
935a83e8de Supprime la branche nalc de plusieurs sous-modules
warps (avec changement d'url), weather_pack, whoison, witchcraft, worldedge
2019-12-06 19:21:48 +01:00
c3c4605c06 Merge branch 'stable-1.1' 2019-12-06 19:02:40 +01:00
8c403f7124 Merge branch 'stable-1.0' into stable-1.1 2019-12-06 19:02:19 +01:00
19427ba8a2 Supprime la branche nalc du sous-module vector_extras 2019-12-06 19:01:37 +01:00
862973f514 Merge branch 'stable-1.1' 2019-12-06 18:55:40 +01:00
73688eff84 Merge branch 'stable-1.0' into stable-1.1 2019-12-06 18:55:13 +01:00
0c7ec37108 Supprime la branche nalc de plusieurs sous-modules
unifiedbricks, unifieddyes, unified_inventory, unifiedwool, u_skins
2019-12-06 18:52:08 +01:00
2866c7686c Merge branch 'stable-1.1' 2019-12-06 18:28:02 +01:00
f8e7c9de44 Merge branch 'stable-1.0' into stable-1.1 2019-12-06 18:27:39 +01:00
8b2ab41ba1 Supprime la branche nalc et change l'url de plusieurs sous-modules
technic, technic_armor, throwing, treasurer, tsm_chests_dungeon, tsm_mines
2019-12-06 18:25:28 +01:00
f3c87a27c8 Merge branch 'stable-1.1' 2019-12-01 22:28:11 +01:00
d321b60cd1 Merge branch 'stable-1.0' into stable-1.1 2019-12-01 22:27:32 +01:00
21cb8e803d supprime la branche nalc de plusieurs sous-modules
serverguide, shutdown, signs_lib (avec changement d'url), snow,
spears, sponge, stained_glass (avec changement d'url)
2019-12-01 22:20:15 +01:00
86b09308b5 Merge branch 'stable-1.1' 2019-12-01 17:08:23 +01:00
47f7f05112 Merge branch 'stable-1.0' into stable-1.1 2019-12-01 17:07:54 +01:00
268a663782 Supprime la branche nalc de plusieurs sous-modules
random_messages, report, returnmirror, riesenpilz, runes
2019-12-01 17:00:53 +01:00
9496feef71 Merge branch 'stable-1.1' 2019-12-01 16:15:47 +01:00
e2e8219f9b Merge branch 'stable-1.0' into stable-1.1 2019-12-01 16:15:19 +01:00
30c53522f8 Supprime la branche nalc de plusieurs sous-modules
paintings, pdisc, playeranim, playereffects, player_inactive,
player_monoids, pmobs
2019-12-01 16:13:32 +01:00
a30a46469b Merge branch 'stable-1.1' 2019-12-01 15:32:54 +01:00
68b9136232 Merge branch 'stable-1.0' into stable-1.1 2019-12-01 15:32:37 +01:00
0247949179 Supprime la branche nalc de plusieurs sous-modules
names_per_ip, news, notice
2019-12-01 15:31:09 +01:00
c38dfda23e Merge branch 'stable-1.1' 2019-11-25 01:07:39 +01:00
350f06dec7 Merge branch 'stable-1.0' into stable-1.1 2019-11-25 01:02:35 +01:00
00e89e3ab3 Supprime la branche nalc du sous-module name_restrictions 2019-11-25 00:58:39 +01:00
dac0d1eb14 Merge branch 'stable-1.1' 2019-11-17 23:28:42 +01:00
cb839b895d Merge branch 'stable-1.0' into stable-1.1 2019-11-17 23:28:18 +01:00
d56a359ddb Supprime la branche nalc de plusieurs sous-modules
moretrees, mtfoods, multitest
2019-11-17 23:21:51 +01:00
6a524d43e5 Merge branch 'stable-1.1' 2019-11-17 22:51:56 +01:00
4d34ce0ce8 Merge branch 'stable-1.0' into stable-1.1 2019-11-17 22:51:37 +01:00