Commit Graph
3659 Commits
Author SHA1 Message Date
Vincent Lee df8fc76c48 Fix #2975, fix #2976 2019-10-05 12:40:19 -05:00
Vincent Lee 74055595ba Mark patchouli as a dep 2019-10-05 12:05:22 -05:00
Hubry fc65cbd1f5 Tweak templates, remove workarounds, mark some entries as default read 2019-10-03 20:20:49 +02:00
Vincent Lee 90977798d4 Partially restore corporea crystal cube model 2019-09-27 22:37:45 -05:00
Vincent Lee bf79be5210 'Fix' shader loading 2019-09-27 12:02:09 -05:00
Vincent Lee 43c5fadce5 Misc todo fixes and cleanups 2019-09-27 11:27:22 -05:00
Vincent Lee 8553a4d5df Fix placing platforms against platforms not playing the place sound 2019-09-27 10:49:33 -05:00
Vincent Lee a3b7f1c4b0 Combine camo and platform classes, they didn't ever need to be separate 2019-09-27 10:43:54 -05:00
Vincent Lee 172119701c Merge branch '1.14' into patchouli 2019-09-24 16:52:33 -05:00
Hubry ab412507c7 Port lexicon pages to Patchouli, improve generator code 2019-09-24 23:16:29 +02:00
Vincent Lee 2f5d163427 Fix use of client only method 2019-09-14 20:07:26 -05:00
Vincent Lee b4e0a076e7 Finish migrate to vanilla particle sys 2019-09-14 19:50:52 -05:00
Vincent Lee f0993c20a4 Prep for moving to vanilla particle system 2019-09-14 18:16:13 -05:00
Vincent Lee 4cd4b220d3 Fix curios version string, fix armors not using mana for durability, fix fluid display in pure daisy JEI 2019-09-14 12:36:04 -05:00
Vincent Lee b0ec69f1f0 Require curios 2019-09-14 11:58:33 -05:00
Vincent Lee a3b6a2ca6b Fix missing mossy dremawood planks model, semi-fix ghost rails 2019-09-14 11:47:17 -05:00
Vincent Lee 35df76b230 remove wrapping log 2019-09-13 23:22:22 -05:00
Vincent Lee cdf4a26a94 Fix swapped color in lens dying 2019-09-13 23:22:04 -05:00
Vincent Lee a56dd81eed Fix spawn packet for bursts 2019-09-13 22:00:39 -05:00
Vincent Lee 107097af0d Fix some dumb bugs and crashes 2019-09-13 21:55:33 -05:00
Vincent Lee 7d318bb3bf Merge 1.12 2019-09-13 18:12:46 -05:00
Vincent Lee 3c2de8453e bump forge to rb, fix fluid stuff 2019-09-13 17:48:37 -05:00
Vincent Lee 6ba1436ac0 Fix improper dumping of registry names in brew entries 2019-09-09 00:11:26 -05:00
Vincent Lee e9aa92efec Finish multiblocks 2019-09-09 00:04:38 -05:00
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 b0d875b3da Fix #2940 2019-07-04 12:19:20 -07: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