Commit Graph

611 Commits

Author SHA1 Message Date
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
8faedb54da Supprime la branche nalc et change l'url de plusieurs sous-modules
moreblocks, more_chests, morefarming, moreflowers, moremesecons,
moreores, moreplants
2019-11-17 22:47:27 +01:00
9e27212e45 Merge branch 'stable-1.1' 2019-11-17 20:47:39 +01:00
d7c6b81273 Merge branch 'stable-1.0' into stable-1.1 2019-11-17 20:47:00 +01:00
9b33a85c2b Supprime les branches de plusieurs sous-modules
metatools, minercantile, mob_horse, mobs avec changement d'url,
mobs_animal, mobs_monster, mobs_water, moognu
2019-11-17 20:40:34 +01:00
5fde685935 Merge branch 'stable-1.1' 2019-11-08 23:11:10 +01:00
591e9423b2 Merge branch 'stable-1.0' into stable-1.1 2019-11-08 23:10:35 +01:00
1f0030bc46 Suppression de la branche nalc de plusieurs sous-modules
maidroid, mana, mapfix, maptools, markers, maze, mesecons avec
changement d'url.
2019-11-08 23:04:13 +01:00
ae717b63ca Merge branch 'stable-1.1' 2019-11-03 13:13:55 +01:00
46cc6b9ad3 Merge branch 'stable-1.0' into stable-1.1 2019-11-03 13:13:13 +01:00
c24dc1e425 Supprime la branche nalc de plusieurs sous-modules
lantern, lavatemple, lightning, locks
2019-11-03 13:08:05 +01:00
4339eedf88 Merge branch 'stable-1.1' 2019-11-03 12:50:25 +01:00
46befcada7 Merge branch 'stable-1.0' into stable-1.1 2019-11-03 12:50:05 +01:00
b5b450db79 Supprime la branche nalc de plusieurs sous-modules
jumping, kpgmobs
2019-11-03 12:49:04 +01:00
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