Commit Graph
6182 Commits
Author SHA1 Message Date
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
Vincent Lee ffc8deaaed Merge pull request #2977 from Hubry/patchouli
Port lexicon pages to Patchouli, improve generator code
2019-09-24 16:41:54 -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 3bc86fbc54 prep cf changes 2019-09-14 11:59:37 -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 7aca7bbac1 build 2019-09-09 22:22:13 -05:00
Vasco Lavos f03b91c67d Update contributors.properties 2019-09-10 00:22:24 +01: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
Vasco Lavos 29d158617e Update contributors.properties 2019-09-08 02:09:38 +01:00
Vasco Lavos bbeba2b52f Update contributors.properties 2019-09-01 19:12:29 +01:00
Vasco Lavos 4847cb8f2e Update contributors.properties 2019-08-30 17:52:14 +01:00
Vasco Lavos cf4fa0d6cd Update contributors.properties 2019-08-30 01:22:19 +01: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
Vasco Lavos ef685eba7c Update contributors.properties 2019-08-22 16:48:22 +01: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
Vasco Lavos d761cb9d9e Update contributors.properties 2019-08-20 23:27:44 +01:00
Vasco Lavos 845c201b10 Update contributors.properties 2019-08-18 23:34:58 +01:00
Vasco Lavos be98dd4023 Update contributors.properties 2019-08-16 08:42:14 +01:00
Vincent Lee 7003ba52ee bump forge 2019-08-15 20:12:55 -07:00
Vasco Lavos 45b075bf85 Update contributors.properties 2019-08-15 21:29:37 +01:00
Vincent Lee af740b634f Merge pull request #2951 from Hubry/mostly-lexicon
Make lexicon usable, search for recipes instead of hardcoding ids, and other
2019-08-09 16:04:14 -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
Vasco Lavos 9afecc1a5f Update contributors.properties 2019-08-08 04:24:53 +01:00
Vasco Lavos f6673e7ed1 Update contributors.properties 2019-08-06 02:04:49 +01:00
Vasco Lavos 1c099ea558 Update contributors.properties 2019-08-05 19:54:42 +01:00
Vasco Lavos 2675fef33a Update contributors.properties 2019-08-05 19:46:03 +01:00
Vasco Lavos c615f5e526 Update contributors.properties 2019-08-04 20:37:59 +01: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