upstream/Botania
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Botania.git synced 2026-11-12 16:27:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,619 Commits 12 Branches 179 Tags
b360ad778d6f727382fa2ae8a0c8e01845f4d082
Commit Graph
3619 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vasco Lavos b360ad778d Merge branch 'master' of https://github.com/Vazkii/Botania 2015-11-18 20:08:13 +00:00
Vasco Lavos 9becb6607f 11 2015-11-18 20:07:39 +00:00
Vasco Lavos 2f0edfc801 12 2015-11-18 20:07:28 +00:00
Vasco Lavos 6699a0db87 Merge pull request #1557 from OJwithC/master 
Update en_US.lang
 2015-11-18 19:57:00 +00:00
OJwithC cf786e4a5e Merge pull request #1 from OJwithC/OJwithC-patch-1 
Update en_US.lang
 2015-11-18 10:33:52 -05:00
OJwithC b124a7c12f Update en_US.lang 
Aditional Dadelifeons
 2015-11-18 10:29:50 -05:00
Vasco Lavos 95b256fd15 Build 234 2015-11-17 23:00:32 +00: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
Vasco Lavos f689cf8983 Proper seed colors 2015-11-17 22:13:15 +00:00
Vasco Lavos 18bdd6d32d S E E D S B O Y Z 2015-11-17 21:59:31 +00:00
Vasco Lavos 411c14199e Added IFlowerPlaceable for items that can be placed by the Rannuncarpus. 2015-11-17 20:14:44 +00:00
Vasco Lavos 709a8b4338 Changed the Mutated Grass texture into one that hurts your eyes less 2015-11-17 20:01:16 +00:00
Vasco Lavos 9b91af6210 Removed the "lore" pages after some flowers' recipes, as interesting as they are, they served no practical purpose and only confused people. 2015-11-17 19:55:41 +00:00
Vasco Lavos 07bdb7ecd1 Fixed the Exoflame not using mana properly on interfaced blocks. 2015-11-17 19:51:28 +00:00
Vasco Lavos 1fc1e201cd Many grasses! Handle it! 2015-11-17 19:45:29 +00:00
Vasco Lavos 1592efdc62 Reorder new grass types 2015-11-17 18:26:25 +00:00
Vasco Lavos 4b5e02b1ac Recipe/docs for the new lens 2015-11-16 21:51:52 +00:00
wiiv 4800ac48a9 Less Techy? 2015-11-16 16:21:38 +00:00
Vasco Lavos 522740a893 Tweaked manaweave armor model 2015-11-16 15:37:24 +00:00
Vasco Lavos 45c2724a6b Fixed the Redirective lens redirecting if fired from a blaster 2015-11-16 15:26:21 +00:00
Vasco Lavos 9c25373dc8 Agricarnations are now quieter. 2015-11-16 15:25:59 +00:00
Vasco Lavos 576a6233af Merge branch 'master' of https://github.com/Vazkii/Botania 2015-11-16 15:11:08 +00:00
Vasco Lavos 0773fd7af6 This name is far more accurate. 2015-11-16 15:10:56 +00:00
wiiv eadeea0b92 Armor texture tweaks. 2015-11-16 02:24:00 +00:00
wiiv c0d13a1507 Mana detectors, now with color. 2015-11-15 23:42:34 +00:00
wiiv 0e3d3817b0 New Stuff Galore! 2015-11-15 23:08:05 +00:00
Vasco Lavos 7f7fa4cc98 Fixed botania Panes having weird lighting in corners. 2015-11-15 22:01:32 +00:00
Vasco Lavos 3fa9ca216d New Lenses (part 3) 2015-11-15 22:01:09 +00:00
Vasco Lavos 5f8c650fa2 New Lenses (part 2) 2015-11-15 20:57:06 +00:00
Vasco Lavos 7c9084eab2 New Lenses (part 1) 2015-11-15 19:49:12 +00:00
Vasco Lavos f1193e8af6 Fixed Entropic Mana Lenses exploding if in contact with a full mana spreader 2015-11-15 19:23:56 +00:00
Vasco Lavos 414249919e Bellethrones can now kill witches properly 2015-11-15 18:36:28 +00:00
Vasco Lavos dfcaddab3c Made luminizers quieter 2015-11-15 18:29:18 +00:00
Vasco Lavos d8415a8282 Finalize scp upload 2015-11-15 15:46:27 +00:00
Vasco Lavos b82b4e5be1 More work on scp uploading 2015-11-15 15:35:03 +00:00
Vasco Lavos 97af8c9016 Merge branch 'master' of https://github.com/Vazkii/Botania 2015-11-15 15:14:49 +00:00
Vasco Lavos 2975915233 Change gradle upload from FTP to SCP. Untested, will probably explode horribly. 2015-11-15 15:14:36 +00:00
Vasco Lavos 683ae951c3 Update contributing.md 2015-11-13 13:00:27 +00:00
Vasco Lavos d32b47b971 Merge pull request #1543 from MatthiasMann/master 
avoid unnecessary object allocation
 2015-11-13 12:58:43 +00:00
Matthias Mann ab633fb419 avoid unnecessary object allocation 2015-11-13 09:03:54 +01:00
Vasco Lavos cf26ce2f2b Build 233 2015-11-12 23:33:48 +00:00
Vasco Lavos c1e697feb7 Fixed items that take damage when used in a crafting recipe taking damage purely by being put in the grid. Closes #1458 2015-11-12 23:26:33 +00:00
Vasco Lavos afdf57e070 Save current texture before using the lexica botania shader and rebind it afterwards. Closes #1533 2015-11-12 23:16:23 +00:00
Vasco Lavos 6c88006941 Build 232 2015-11-11 22:23:09 +00:00
Vasco Lavos 314488248f Using Phantom Ink on an item that already has it will now remove it. 2015-11-11 22:17:05 +00:00
Vasco Lavos 259c7fbbd4 You can stand inside mana pools now. 2015-11-11 21:50:16 +00:00
Vasco Lavos 1593f92ec7 Primus Loci are a bit less rare now. 2015-11-11 21:39:05 +00:00
Vasco Lavos 917a0aa229 Luminizers now synergize with Ender Pearls. 2015-11-11 21:38:33 +00:00
Vasco Lavos dd7a9d56d7 Remove debug print 2015-11-11 21:07:49 +00:00