Commit Graph

181 Commits (master)

Author SHA1 Message Date
Milan d91e093776 add submodule technic_armor 2019-01-04 13:26:30 +01:00
Milan Ihl 8c927a8585 replace submodule 3d_armor 2018-12-21 18:55:58 +01:00
Milan 77ee2f8fb1 drop submodule mobs_balrog 2018-12-14 13:42:54 +01:00
tchncs 03cde3f325 fix mergeconflict 2018-11-29 12:38:43 +01:00
tchncs 9b98cc66ab add submodule illuna_costumes 2018-11-29 12:36:59 +01:00
Milan 2b3c07a487 replace submodule areas 2018-11-20 09:33:25 +01:00
tchncs 62d93a778f add forked version of protector 2018-11-04 22:16:23 +01:00
Milan b19cd45dcf update some submodule urls 2018-09-28 12:19:47 +02:00
Milan* ae9906cded replace submodule playereffects 2018-02-26 22:46:41 +01:00
Milan* 0e1d24c48b update submodule irc 2018-01-01 19:35:29 +01:00
Milan* 662bc2163a replace submodule basic_robot 2017-12-19 11:14:35 +01:00
Milan ecc13c9cc9 replace submodule playereffects and update submodule horses,mobs_animal,mobs_monster,mobs_more_monsters 2017-11-07 11:57:50 +01:00
Milan 09f2f06a8b fix submodule mobs_redo 2017-10-20 23:49:49 +02:00
Milan 71e26df782 fix submodule mobs_monster 2017-10-20 22:15:26 +02:00
Milan 5a0ac5d109 replace submodule mobs_animal 2017-10-09 13:25:55 +02:00
Milan* 6fac12edf6 update submodule dmobs 2017-09-20 09:47:35 +02:00
Milan ee7fedccef add submodule playerskins 2017-09-17 15:21:20 +02:00
Milan* 55caa128e8 add/update submodule loud_walking 2017-09-15 23:49:37 +02:00
Milan* 9e9b338b9c update submodule mesecons 2017-09-14 16:21:26 +02:00
Milan 1ad2fca75c fix submodule mycastle 2017-09-09 13:12:22 +02:00
Milan* 2f16b86302 add submodule sneak_glitch 2017-09-02 22:52:44 +02:00
Milan* 5b2b097c00 drop submodule hemp 2017-08-07 20:57:56 +02:00
Milan* 51cad44722 add submodule mydoors 2017-08-06 11:53:58 +02:00
Milan* 489b8310e1 add submodule unified_inventory 2017-08-04 16:25:42 +02:00
Milan 4021dc261a drop submodule bags 2017-08-04 16:08:34 +02:00
Milan* 730211485a drop coloured_nametag mod 2017-07-30 17:45:59 +02:00
Milan* c0c5f3526f readd (and update) submodules mg_villages+handle_schematics 2017-07-30 12:00:43 +02:00
Milan* d233cb9763 update submodule illuna_ethereal 2017-07-28 23:12:42 +02:00
Milan* cd4b70d7dd replace submodule mobs_redo 2017-05-27 10:11:44 +02:00
tchncs 30d169c618 add submodule irc 2017-05-23 12:19:06 +02:00
Milan* de20dddc3a replace submodule wiki 2017-05-23 10:45:40 +02:00
Milan* fe120be941 add submodule wiki 2017-05-22 18:45:19 +02:00
Milan* 56e4678f61 drop submodule farming, boats for easier mtg merges 2017-05-22 08:48:31 +02:00
Milan* f92ff3abc4 update submodule homedecor
add submodule moreblocks
2017-05-21 23:05:59 +02:00
Milan* 38c0dd33d5 update submodule illuna_ethereal 2017-05-21 21:55:57 +02:00
Milan* 3c536e8e5a add some worldmods to the subgame 2017-05-21 11:58:58 +02:00
Milan* 7dcb844f18 add submodule digilines, turtle, basic_robot 2017-03-28 14:15:11 +02:00
Milan* fc23cd62f2 add submodule hopper 2017-03-25 11:31:07 +01:00
tchncs ea26028784 add submodule unifieddyes as requiered by technic 2017-03-18 08:31:17 +01:00
Milan* 2ce30050d4 update all submodules with updates
submodule update 3d_armor
submodule update hemp
submodule update mobs_animal
submodule update mobs_monster
submodule update mobs_redo
submodule update pipeworks
submodule update playereffects
submodule update princess
submodule update protector
submodule update technic
submodule update wine
submodule update worldedit
drop chat_bubbles
2017-03-18 08:07:57 +01:00
tchncs 133cd86cb6 re-add submodule fun_caves 2017-03-17 23:05:16 +01:00
tchncs 376b009159 drop submodule fun_caves to solve conflicts 2017-03-17 23:04:38 +01:00
Milan* 9d221299d9 replace/add submodules caverealms, underworlds, fun_caves 2017-03-17 22:50:49 +01:00
Milan* 70f14fda58 update submodule ethereal 2017-03-15 11:41:51 +01:00
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
ClaudiusMinimus c3bf0db6cc feat: adding billboard module, nothing super here yet 2016-09-18 13:59:25 -06:00
tchncs b86541f77e add submodule coloured_nametag 2016-09-14 19:02:37 +02:00
tchncs 09b84d216a merge upstream 2016-09-04 23:42:08 +02:00
tchncs 1ff31ee41c add submodule technic_chests 2016-09-04 23:41:00 +02:00
tchncs ebe850969c fix submodule columnia 2016-09-03 11:15:35 +02:00
tchncs 9fb3a1960b re-add farming, bones 2016-09-01 14:08:58 +02:00