Commit Graph
3624 Commits
Author SHA1 Message Date
Vincent Lee dad9192a8d Couple of multiblocks 2019-08-27 19:12:49 -05:00
Vincent Lee f2616f99c6 Add in dummy templates so the game doesnt crash 2019-08-27 18:09:11 -05:00
Vincent Lee d1636c79fb use patchouli native crafting page for single recipe pages 2019-08-27 17:36:20 -05:00
Vincent Lee 6966e620c4 Rename files to snake case, fix special flower category names 2019-08-27 17:08:49 -05:00
Vincent Lee 0e187f0756 dumper code + temporary dumped results 2019-08-27 16:39:31 -05:00
Vincent Lee 218fb4c2c7 experimenting with patchouli 2019-08-26 16:01:02 -05:00
Vincent Lee cb31f06b69 Clean up gun model a bit 2019-08-24 12:27:57 -05:00
Hubry bd8ce05831 Various 1.14 work (#2955)
* Fix GoG islands appearing below world height

* Fix tallgrass being used instead of grass blocks

* Hook up flower worldgen again

* Fix index bookmark deserializ., remove debug, use nondeprecated method

* Backward compat for headflowers

* Sort recipes by input item order
2019-08-21 17:30:44 -05:00
Vincent Lee 7003ba52ee bump forge 2019-08-15 20:12:55 -07:00
Hubry 290c69443d Make lexicon usable, search for recipes instead of hardcoding ids
Make dice of fate function again,
fix most remaining crafting recipes,
fix lexicon images
2019-08-09 23:10:11 +02:00
Vincent Lee fb2cac4bf0 cleanups, add some vanilla tags 2019-08-04 10:45:33 -07:00
Vincent Lee f671faf20a delete unused versionchecker code 2019-08-04 09:54:00 -07:00
Vincent Lee 2f53768495 Merge branch '1.14' of github.com:Vazkii/Botania into 1.14 2019-08-04 09:46:34 -07:00
Vincent Lee df4d1f9826 Bump to 1.14.4 and fix compile 2019-08-04 09:46:04 -07:00
Vincent Lee 2536d842db Merge pull request #2941 from Hubry/stuff
Convert items to objectholder, fix some i18n and missed recipes, etc.
2019-07-20 09:31:56 -07:00
Vincent Lee ea84b87c0d Sync recipes on reload (untested) 2019-07-17 20:56:51 -07:00
Vincent Lee e9c669034e misc fixes 2019-07-17 20:05:36 -07:00
Vincent Lee 0315863e6a Move rod of shaded mesa blacklist to entity tags 2019-07-17 19:59:06 -07:00
Vincent Lee e7f79f3336 Update forge, restore jei integration 2019-07-17 19:48:28 -07:00
Hubry 99eb08a303 Convert items to objectholder, fix some i18n and missed recipes 2019-07-05 19:40:46 +02:00
Vincent Lee b9980ffaac temporarily fix particles 2019-07-03 23:46:01 -07:00
Vincent Lee 9ade570e78 Fix texture stitching 2019-07-03 22:02:03 -07:00
Vincent Lee 55a2d42a29 Make recipes reloadable using an event. Eventually they may move to jsons/files, but this will do for now 2019-07-03 21:47:42 -07:00
Vincent Lee c4278be1ff couple todos 2019-07-01 22:09:05 -07:00
Vincent Lee c07d3d12bd Fix a couple recipes/loot tables 2019-07-01 21:53:54 -07:00
Vincent Lee 56320fce98 Move potion textures to vanilla atlas 2019-07-01 21:43:50 -07:00
Vincent Lee 9d46ff7fe0 Fix some crashes and things on wrong bus, add valid blocks to TETypes 2019-07-01 21:11:51 -07:00
Vincent Lee 633c3e7b4d Move jei integration out temporarily for compiling, update mods.toml 2019-07-01 20:37:48 -07:00
Vincent Lee 5304645972 Compiling 2019-07-01 20:27:37 -07:00
Vincent Lee 7cdc5c9ce0 Almost there 2019-07-01 00:31:06 -07:00
Vincent Lee 233ab271f7 another half 2019-06-30 15:49:33 -07:00
Vincent Lee 64d90dd502 Fix slab tables 2019-06-30 14:54:29 -07:00
Vincent Lee 2b7a780736 block loot tables 2019-06-30 14:51:22 -07:00
Vincent Lee 27ec1e58fc Below 300 errors 2019-06-30 13:34:45 -07:00
Vincent Lee d0acd5fdb0 Another pass 2019-06-29 22:55:04 -07:00
Vincent Lee fc1dd61c53 Another pass through 2019-06-29 14:54:39 -07:00
Vincent Lee bd5b395ee8 More work, pretty close to being back to 1.13 level 2019-06-29 00:28:18 -07:00
Vincent Lee 828d952a86 Fix most of entities 2019-06-27 22:36:46 -07:00
Vincent Lee 207a66b121 more random fixes 2019-06-25 21:04:36 -07:00
Vincent Lee e7dc900634 brief pass through trinkets 2019-06-24 19:51:18 -07:00
Vincent Lee 815e4f9e92 Rerun migration maps for curio change 2019-06-24 19:27:28 -07:00
Vincent Lee d6595872be Merge branch '1.13' into 1.14 2019-06-24 19:25:02 -07:00
Hubry 05c88fd62a Make handling of curios centralized and add handling for no curios (#2913)
Minor fixes to cosmetic bauble rendering (GL stack overflows),
include the missed belt in belt curios
2019-06-24 18:45:59 -07:00
Vincent Lee 898e15a221 Misc fixes 2019-06-22 14:04:02 -07:00
Vincent Lee 0f8625adff Pass through subtiles 2019-06-22 00:11:23 -07:00
Vincent Lee 070093c9e5 Update forge, Replace spawn->addEntity, misc fixes in TE's 2019-06-21 23:43:52 -07:00
Vincent Lee cce2f81d15 Misc fixes around 2019-06-08 18:47:15 -07:00
Vincent Lee ee08a279a7 Fix some block methods 2019-06-08 18:08:15 -07:00
Vincent Lee c7cc76e1f3 openglhelper -> glx 2019-06-08 01:20:51 -07:00
Vincent Lee 0e3c5949a1 Remove blockfaceshape 2019-06-08 01:19:50 -07:00