Commit Graph
182 Commits
Author SHA1 Message Date
Vasco Lavos a3408e1d2c Finish the dodge ring 2016-09-22 17:38:40 +01:00
Vasco Lavos 46befb879d More purging 2016-09-11 19:19:07 +01:00
Vasco Lavos 1edbc41b12 Removed fluff. Closes #1883 2016-09-11 19:12:53 +01:00
Vasco Lavos 48826ca660 Update lexicon, achievements and localization for the removal of dayblooms and nightshades. Closes #1881 2016-09-11 18:13:30 +01:00
Vincent Lee ba3f337520 Remove moss stone botaina recipe, remove old tooltips 2016-08-15 12:11:51 -05:00
Vincent Lee c5d5e59b96 Byebye Future (hah) stones! 2016-07-23 14:50:03 -05:00
Vincent Lee cf56634a91 Byebye thatch and reeds! 2016-07-23 14:04:49 -05:00
Vincent Lee 9a11ebef1f Fix 1.8 stones not being voided, clean up ore dict registrations that are no longer needed 2016-06-22 19:16:52 -05:00
Vincent Lee 337851994f Fix bad portuguese brick recipes. Closes #368 2016-06-21 19:44:14 -05:00
Vincent Lee 05c6a07bc2 Clean up logging and log spam. #cleanloginitiative 2016-06-04 19:01:34 -05:00
yrsegal 3c159e2485 Fix recipesorter complaining
Closes #269
2016-05-18 21:01:09 -04:00
Vincent Lee 056f46b1f8 Update to 1.9.4 - untested waiting on baubles 2016-05-18 15:22:35 -05:00
Vincent Lee 4231dc839f Add reverse petal block recipes 2016-05-07 11:56:57 -05:00
Vincent Lee 2d412ac70f Various cleanups, updated alt textures to 1.9 2016-05-04 18:38:09 -05:00
Wire Segal b090622477 Add a ManaUpgradeRecipe. (#218)
third pr for recipes, yay
2016-04-17 22:07:41 -05:00
Vincent Lee a838427df8 Finalized migration mechanisms 2016-04-17 20:32:17 -05:00
Vincent Lee 55262cd4e5 Update nag message, add migration recipes for everything 2016-04-17 20:03:31 -05:00
Vincent Lee de0ba4ada9 Revert "Upload remapping code for troubleshooting"
This reverts commit 9309355af2.
2016-04-17 12:00:49 -05:00
Vincent Lee 9309355af2 Upload remapping code for troubleshooting 2016-04-15 19:24:36 -05:00
Vincent Lee 0a396b0d82 Full optimize imports 2016-04-14 22:49:49 -05:00
Wire Segal 9e82e5357a Armor keeps enchantments when crafted (#213)
* Armor keeps enchantments when crafted

Closes #209

* Copy runic shielding as well
2016-04-14 21:59:36 -05:00
Vincent Lee 533a287bd3 Allow vanilla flowers to be ground directly into powder. Closes #215 2016-04-09 21:03:51 -05:00
Vincent Lee 38ca4b429d Fix recipe conflicts, making chiseled botania bricks craftable again. Closes #29 2016-02-29 21:30:33 -06:00
Vincent Lee ad5b7fd73b Merge upstream 2016-02-18 10:04:02 -06:00
nekosune 9e37f37c53 Added quartz variants to Ore Dictionary 2016-02-02 21:40:38 +00:00
Vincent Lee 576362e400 Big cleanup (begone unchecked warnings!) 2016-02-01 00:08:10 -06:00
Vincent Lee 3d821e5da4 Fix some recipes not taking vanilla prismarine. closes #62 2016-01-21 21:16:00 -06:00
Vincent Lee 7615d0b893 Fix recipes for 1.9 purpur not being registered 2016-01-09 17:49:59 -06:00
Vincent Lee a4a77fb20f Merge upstream 2016-01-08 12:00:01 -06:00
Vincent Lee b24585b13d Update a bunch of recipes to take vanilla blocks and items. Also remove prismarine lex entry and move infusion recipe to mana pool page. 2016-01-05 12:25:53 -06:00
Vincent Lee c8c50f9af0 Future is now part 1: conversions recipes to vanilla 2016-01-04 23:29:50 -06:00
Sam Quinn 17ddae20af Add oredict support 1.8 stone recipes, closes #1660
the code was copy-pastaed from the addStairsAndSlabs helper function to
hack in oredict support, feel free to just add it to the helper function
if you want though. Looking at other Botania code, this is what comes to
mind though.

see #1703
There is also a very big problem that I marked with a comment that says
"very big problem", where on many many different stone types (end,
metamorph, 1.8) the recipe for stone bricks and for chisled is the same,
so usually you can't craft chisled.

sorry for long commit message
2016-01-02 21:38:26 -06:00
Vincent Lee 5d80b7d9ce Fix thaumcraft 5 goggles of revealing integration. closes #14 2016-01-02 19:07:52 -06:00
Vincent Lee b8a1a9cd5d Some 1.8.8 fixes before merging upstream 2015-12-21 12:24:28 -06:00
Vincent Lee 5211ed9149 Merge upstream and probably introduce a zillion errors 2015-12-14 16:38:07 -06:00
Vasco Lavos c904244bcc Lotsa cleanup 2015-12-05 21:10:07 +00:00
Vasco Lavos 2dc664eade Terrasteel armor tweaks, new effects and recipes 2015-12-05 18:56:11 +00:00
Vasco Lavos 57ac50a364 Added the Fabulous Mana Pool. Yes that is its name. 2015-12-04 23:56:56 +00:00
Vasco Lavos 64421a2a3a piston 2015-12-04 21:36:52 +00:00
Vasco Lavos 83599ea26e Changed the Bore Lens recipe to be a lot easier to make. 2015-12-04 20:39:01 +00:00
Vasco Lavos c78e96bee4 Removed Mana Petals. Added Mana Powder. Redid almost all flower recipes. 2015-12-04 19:14:41 +00:00
Vasco Lavos ed6aeeaf45 The Fel Pumpkin is now part of botania itself and not Garden of Glass. 2015-12-04 18:16:47 +00:00
Vasco Lavos 6a3c929abe The Diluted Mana Pool is no longer part of progression. 2015-12-03 23:27:56 +00:00
Vincent Lee a40a443607 Merge upstream 2015-11-26 02:27:25 -06:00
Vasco Lavos 027ad89f94 Recipe/docs for the Bauble Case. 2015-11-25 21:55:39 +00:00
Vasco Lavos 11ec7a5b66 Planestrider's Sash 2015-11-24 23:46:57 +00:00
Vincent Lee e3b22975cb Merge upstream 2015-11-20 01:00:31 -06:00
Vasco Lavos 68ee5145f4 New Grass Seeds' recipe/docs 2015-11-17 22:41:32 +00:00
Vasco Lavos c828461c0c Holding shift on a recipe page with multiple recipes will pause the recipe changing code. It'll also stop petals/rune pieces from rotating. 2015-11-17 22:19:28 +00:00
Vincent Lee 750276db9b Merge upstream 2015-11-17 01:07:15 -06:00