Commit Graph
6157 Commits
Author SHA1 Message Date
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
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
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
Vincent Lee df4d1f9826 Bump to 1.14.4 and fix compile 2019-08-04 09:46:04 -07:00
Vasco Lavos 5d2f404a77 Update contributors.properties 2019-07-28 20:09:08 +01:00
Vasco Lavos 614ab6a698 Update contributors.properties 2019-07-26 21:45:55 +01:00
Vasco Lavos f0112b127a Update contributors.properties 2019-07-26 16:22:16 +01:00
Vasco Lavos 5ae0657626 Update contributors.properties 2019-07-24 17:21:38 +01:00
Vasco Lavos 6ae937a5a6 Update contributors.properties 2019-07-23 13:28:00 +01:00
Vasco Lavos a546a38571 Update contributors.properties 2019-07-22 21:23:58 +01: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
Vasco Lavos 02b27076e8 Update contributors.properties 2019-07-16 12:17:58 +01:00
Vasco Lavos 42f135ecb9 Update contributors.properties 2019-07-08 18:18:52 +01: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
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