Commit Graph

87 Commits

Author SHA1 Message Date
Milan*
464fee1dee fix mergeconflicts 2017-03-15 11:30:00 +01:00
Milan*
6a65683b5a add submodule fun_caves 2017-03-13 11:42:36 +01:00
Milan*
626784702a add submodule illuna_extras 2017-03-13 09:13:13 +01:00
Milan*
07a4991896 add submodule integral 2017-03-06 22:09:29 +01:00
Milan*
eb3980906f add submodule geomoria 2017-03-04 13:05:15 +01:00
Milan*
b89dac55dd add submodule bacon 2017-02-28 20:46:15 +01:00
tchncs
77a9507b55 cleanup 🐱 2017-01-31 12:46:29 +01:00
tchncs
e42de05b85 merge upstream 🐱 2017-01-20 22:37:14 +01:00
tchncs
f9026ab405 drop submodule moresnow 2017-01-07 20:56:57 +01:00
Milan*
82fd20c6a9 update submodule craftguide
add submodule moreblocks
add submodule craftguide
2016-12-19 20:18:13 +01:00
Milan*
c74b9c968d fix mergeconflicts
readd submodule boats+farming
2016-12-15 18:51:42 +00:00
Milan*
50206b842d readd submodule boats, farming 2016-12-15 18:04:19 +00:00
Milan*
960a9de9d8 fix mergeconflicts 2016-12-15 18:03:31 +00:00
tchncs
e574d62946 add submodule moresnow 2016-12-07 12:57:38 +01:00
tchncs
d52a913816 correct misplaced submodule illuna_ethereal 2016-12-06 09:24:08 +01:00
tchncs
113984c556 fix mergeconflict in gitmodules 2016-12-05 21:56:37 +01:00
tchncs
43996e32e6 add submodule illuna_ethereal§ 2016-12-05 21:55:21 +01:00
tchncs
2791afcd2a drop submodule bakedclay
will migrate the plants into an ethereal extension mod
2016-12-05 13:48:44 +01:00
tchncs
3b205b1dae experimental: add submodule chat_bubbles :o 2016-12-04 23:30:00 +01:00
tchncs
03537a8e89 add submodule bakedclay 2016-12-04 21:25:39 +01:00
tchncs
20b5aa2b63 3d_armor: switch back to master
drop submodule clothes
2016-12-04 19:34:47 +01:00
tchncs
6ed418eff1 3d_armor: switch to 0.5.0-dev
add submodule clothing
add submodule character_creator
2016-12-04 17:18:21 +01:00
tchncs
6bdd13d10c add submodule glow 2016-11-20 08:52:44 +01:00
tchncs
ff4a74b92c add submodule city_block 2016-11-19 11:09:21 +01:00
tchncs
aeab9994c9 add submodule princess 2016-11-19 11:04:55 +01:00
tchncs
d8502f74c8 add submodule golems 2016-11-14 11:47:09 +01:00
tchncs
e0f03db8c0 :cat2 2016-11-06 20:30:26 +01:00
tchncs
88c2f9655d update submodule farming
add submodule pipeworks
2016-11-06 20:19:15 +01:00
tchncs
2c5573d5e4 merge upstream 2016-11-06 19:01:28 +01:00
tchncs
cdf95749e0 replace submodule technic 2016-11-06 18:59:56 +01:00
tchncs
4e68d2b8ba replace submodule ethereal 2016-11-06 18:28:33 +01:00
tchncs
ac4255b881 add submodule areas 2016-11-05 19:31:38 +01:00
tchncs
51f4ac1fa4 add submodule markers 2016-11-05 19:31:15 +01:00
tchncs
6ee3c0ff5a add submodule ethereal 2016-11-05 19:00:11 +01:00
tchncs
52cfb48867 drop submodule darkage 2016-11-05 18:23:20 +01:00
tchncs
a95e553fe9 drop submodule plantlife_modpack 2016-11-05 18:21:41 +01:00
tchncs
62ae678443 drop technic_chests, add technic and protector 2016-10-28 17:09:10 +02:00
tchncs
388bdca60f replace submodule mobs_monster 2016-10-24 10:18:03 +02:00
tchncs
6417b1322c add submodule halloween_mobs 2016-10-23 12:27:31 +02:00
tchncs
e31ba2e66b add submodule teleport_potion 2016-10-11 14:34:03 +02:00
tchncs
00a01063e4 add submodule dragons 2016-10-11 10:59:22 +02:00
tchncs
8f56ce63cc add submodule mtcandy and mtfoods 2016-10-08 12:54:14 +02:00
tchncs
50a4c0cd36 add submodule playereffects 2016-10-02 20:50:35 +02:00
tchncs
f669a27cf8 add submodule magical_potion 2016-10-02 20:48:31 +02:00
tchncs
c24359be94 add submodule homedecor_modpack 2016-09-29 17:54:33 +02:00
tchncs
bc675ab2ae re-add bags submodule 2016-09-25 20:16:04 +02:00
ClaudiusMinimus
5bd9eac0ae merged in master 2016-09-22 22:26:34 -06:00
ClaudiusMinimus
ca34223c21 chore: premature submodule removed 2016-09-22 22:14:15 -06:00
ClaudiusMinimus
62f6f3c858 feat: hemp bags for all! (must accept bags PR first) 2016-09-22 22:01:29 -06:00
ClaudiusMinimus
966376cce7 chore: moved billboard to the correct location 2016-09-18 14:12:40 -06:00