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
Vasco Lavos
4b5e02b1ac
Recipe/docs for the new lens
2015-11-16 21:51:52 +00:00
Vincent Lee
5a11a58346
cpw.mods.fml to net.minecraftforge.fml
2015-11-13 19:50:23 -06:00
Vasco Lavos
bf006371ed
Worldshaper's Sextant recipe/docs
2015-11-02 21:42:51 +00:00
Vasco Lavos
873f06d5a4
Cheaper spark recipe
2015-10-30 18:28:59 +00:00
Vasco Lavos
a6729c088b
Cleanup
2015-10-25 00:02:45 +01:00
Vasco Lavos
73377e311d
Recipe/docs for the Livingwood Avatar.
2015-10-25 00:00:43 +01:00
Vasco Lavos
3ad1c46da5
Cleanup
2015-10-11 19:54:44 +01:00
Vasco Lavos
2752f6f0df
Rainbows for everyone!
2015-10-11 16:09:29 +01:00
Vasco Lavos
9cf015ee97
Cleanup!
2015-10-01 23:20:58 +01:00
Vasco Lavos
caa444f9bf
Recipe/docs for the Teru Teru Bozu.
2015-10-01 23:09:20 +01:00
Vasco Lavos
606917e04b
Decorative monocle and panes.
2015-09-30 22:53:11 +01:00
Vasco Lavos
228c606237
Added two new Portuguese Pavement Colors, yellow and green.
2015-09-29 15:20:12 +01:00
Vasco Lavos
b1511de6d3
Recipe/docs for the Corporea Retainer and the new Crystal Cube stuff. Also a recipe counter for fun.
2015-09-28 22:08:42 +01:00
Vasco Lavos
a624f73902
Red Stringed Interceptor.
2015-09-21 18:35:58 +01:00
Vasco Lavos
51a82ccf37
Some more Dandelifeon tweaks.
2015-09-19 16:23:51 +01:00
Vasco Lavos
e62c3c4881
Dandelifeon recipe/docs
2015-09-06 20:00:31 +01:00
Vasco Lavos
d5ad97b74b
Use cobblestone instead of stone...
2015-09-01 20:02:09 +01:00
Vasco Lavos
c7dbac53f3
Pavement recipe/docs
2015-09-01 20:01:20 +01:00
Vasco Lavos
11fe8faa93
Manufactory Halo recipe/docs.
2015-09-01 17:10:20 +01:00
Vasco Lavos
3de6177092
Cleanup
2015-08-28 23:14:45 +01:00
Vasco Lavos
a1e8a78b57
Craftable bifrost blocks.
2015-08-28 23:12:40 +01:00
Vasco Lavos
ba356af922
Recipe/docs for Manaweave.
2015-08-28 22:44:03 +01:00
Vasco Lavos
585f36421c
Implemented Manaweave Armor and the Proficiency concept.
2015-08-28 22:19:03 +01:00