Commit Graph
5402 Commits
Author SHA1 Message Date
Vincent Lee 03ece97fdf Merge branch '1.12' of github.com:Vazkii/Botania into 1.12 2017-07-22 17:28:24 -05:00
Vincent Lee 2b2f48f085 Remove pickDefaultState hack from 1.9 since it's unneeded now 2017-07-22 17:14:46 -05:00
Vincent Lee 35d440ad37 Add note for pagecraftingrecipe 2017-07-20 23:45:23 -05:00
Vincent Lee 9d78aca015 Clean up some todos 2017-07-20 23:42:45 -05:00
Vincent Lee a990e6a8d5 Diff spam warning: Bump forge, move wand recipes to json. Are we done? 2017-07-20 23:34:11 -05:00
Vincent Lee c3ff13bce0 More. recipes. 2017-07-20 20:53:00 -05:00
Vincent Lee 73b440732a Remove debug log from prev commit 2017-07-16 18:42:19 -05:00
Vincent Lee 9f0068538e Fix #2309 and also fix the particles not accounting for position shift 2017-07-16 18:41:25 -05:00
Vincent Lee 1d810fba7a More recipes. 2017-07-16 15:53:44 -05:00
Vincent Lee 63b9fa19d1 Moar recipes, fix wand recipes 2017-07-15 21:20:56 -05:00
Vincent Lee 0d25e3913b Bump forge 2017-07-15 14:08:08 -05:00
Vincent Lee fed7394e0c Moar recipes back in lexicon 2017-07-13 20:18:08 -05:00
Vincent Lee 833324e150 Some recipes displaying in lexicon again 2017-07-09 12:18:20 -05:00
Vincent Lee adfa6c92c0 Cleanup some volatiles 2017-07-05 20:14:02 -05:00
Vincent Lee 7c008784d8 Cleanup: switch bunch of things to @EventBusSubscriber 2017-07-05 20:08:50 -05:00
Vincent Lee 1ec96fc475 Some prep work for recipes in lexicon 2017-07-05 20:00:02 -05:00
Vincent Lee 130e3916b2 Fix advancement parents 2017-07-04 12:22:07 -05:00
Vincent Lee 69b2e1483c Bunch more advancements (that don't seem to work for some reason >.>) 2017-07-02 21:58:56 -05:00
Vincent Lee 6671486c11 Rename translation keys for generating/functional flower advancements as they were inaccurate 2017-07-01 22:18:43 -05:00
Vincent Lee 27d66c18ba Fix code granting of criterion for last commit 2017-07-01 22:16:56 -05:00
Vincent Lee 288bbf5dc1 Fix terrablade title and desc 2017-07-01 22:13:15 -05:00
Vincent Lee cf593abd21 Rename all the jsons from their vocaloid names to unlocal names for ease of lookup 2017-07-01 22:12:57 -05:00
Vincent Lee 1b157c4f86 A couple more advancements 2017-07-01 22:09:52 -05:00
Vincent Lee f0e13b7d3b More advancements 2017-07-01 16:28:50 -05:00
Vincent Lee 38e1a5a1f1 Fix base advancements being specified dumbly 2017-07-01 08:31:05 -05:00
Vincent Lee 209b52bb80 Fix the few guis we have 2017-06-29 20:58:51 -05:00
Vincent Lee d7ffc27dc9 Some more advancements 2017-06-29 20:47:27 -05:00
Vincent Lee e571fc4915 Don't reinvent the wheel, GardenOfGlass recipe condition is just forge:mod_loaded 2017-06-29 20:25:36 -05:00
Vincent Lee cf0819e9b9 Some advancements 2017-06-29 20:12:04 -05:00
Vincent Lee 797fd9257c Start work on advancements 2017-06-27 23:16:27 -05:00
Vincent Lee 84845f9c5c Fix getsubblocks 2017-06-27 21:30:15 -05:00
Vincent Lee 7feea17302 Update forge and fix compiles, and cleanup some recipes 2017-06-27 21:26:48 -05:00
Vincent Lee b29e95df81 Switch to new getDrops 2017-06-25 16:56:31 -05:00
Vincent Lee 4091c7e4fb Fix some todos, modernize JEI, other housekeeping 2017-06-25 16:44:08 -05:00
Vincent Lee 4cc6ab2266 Fix all recipes except wand 2017-06-25 16:05:08 -05:00
Vincent Lee 3c95f951dd Misc fix other recipes, remove dumper code 2017-06-25 15:52:02 -05:00
Vincent Lee 19aec9d25b Enable/disable recipes appropriately based on GoG 2017-06-25 15:32:17 -05:00
Vincent Lee 18bf7526b2 Move most recipes to json 2017-06-25 14:42:54 -05:00
Vincent Lee e4b8bb2b52 Hide dynamic recipes from the book 2017-06-25 12:04:39 -05:00
Vincent Lee 789a380e7d Move things to AT so we know when they break immediately 2017-06-25 11:43:35 -05:00
Vincent Lee 37098050cc Fix block oredict registration throwing errors 2017-06-25 09:33:00 -05:00
Vincent Lee 5332cdfad2 Fix getSubItems 2017-06-25 09:26:34 -05:00
Vincent Lee c58ae21173 Fix sounds (removing BotaniaSoundEvents, query the registry directly
instead

Full optimize imports (sorry diff thrash :/)
2017-06-25 01:40:46 -05:00
Vincent Lee e0e5503fe8 Bump JEI, get things running 2017-06-25 01:18:06 -05:00
Vincent Lee acfa518f62 Other non-recipe misc fixes 2017-06-25 00:25:15 -05:00
Vincent Lee 1dd68f9558 Move dynamic recipes to new registration system 2017-06-25 00:18:15 -05:00
Vincent Lee 48784fe495 Same for fluff blocks 2017-06-25 00:09:08 -05:00
Vincent Lee 901f70da88 Move non-fluff blocks to new registreation system (yay no more registering in ctors) 2017-06-24 23:47:59 -05:00
Vincent Lee a6b37966a1 Move items, sounds, potions to new registration system 2017-06-24 22:48:35 -05:00
Vincent Lee 101c72e633 Bump forge again 2017-06-24 22:28:18 -05:00