Compare commits

...
83 Commits
Author SHA1 Message Date
Vincent Lee 0f41f1fcc0 Add zipped form of alt textures 2016-02-07 12:06:04 -06:00
Vincent Lee f41e393322 Mesa apothecary split 2016-02-07 11:51:07 -06:00
Vincent Lee 1de5048653 More lexicon model work 2016-02-07 11:47:25 -06:00
Vincent Lee 7e1ef7aa7f Tweak gravityrod, terrapick, and tornadorod animation. Made terraform rod respect world specific sea level. Closes #102 2016-02-06 23:54:28 -06:00
Vincent Lee fe1d88379d Fix AABB derp in rod of the skies, closes #98 2016-02-06 22:54:40 -06:00
Vincent Lee 8cf71200ee More lexicon faffing 2016-02-06 22:39:43 -06:00
Vincent Lee 26bc6b0059 Split out alt resources 2016-02-06 15:57:16 -06:00
Vincent Lee b6f51f1ccf Preliminary work on lexicon first person model 2016-02-05 19:57:29 -06:00
Vincent Lee 7e642cb03a Mop check for multiblocks. Closes #95 2016-02-05 15:54:42 -06:00
Vincent Lee 75ce19ddc6 Fix querying itemless blocks, closes #90 2016-02-05 15:52:44 -06:00
Vincent Lee 6f6f330a5a Fix lexicon npe, closes #94 2016-02-05 15:50:46 -06:00
Vincent Lee eedfff10f1 Fix the warp ward recipe 2016-02-05 15:47:28 -06:00
Vincent Lee 65fe04af3a Restore thaumcraft integration. Closes #74 2016-02-05 13:36:59 -06:00
Vincent Lee b8e06a3d36 update readme 2016-02-03 16:59:00 -06:00
Vincent Lee 2fdcbdb668 Fix compile error and a few more warnings. 2016-02-01 00:16:18 -06:00
Vincent Lee 576362e400 Big cleanup (begone unchecked warnings!) 2016-02-01 00:08:10 -06:00
Vincent Lee edceea8922 Clean up some jsons 2016-01-31 20:03:03 -06:00
Vincent Lee 727d0480df Some tweaks to life imbuer 2016-01-30 23:21:29 -06:00
Vincent Lee a0494475dd Fix several glcolorub's leaking 2016-01-30 17:31:34 -06:00
Vincent Lee 6e48bb9a44 Fix thorn chakram render, make it remember the stack used to thrown it (name will persist, etc.) 2016-01-30 16:19:33 -06:00
Vincent Lee bc29d37446 Finish off baubles. Closes #49. 2016-01-29 21:00:48 -06:00
Vincent Lee 7db49dae78 Fix heisei dream being completely broken 2016-01-28 11:55:46 -06:00
Vincent Lee 4ac196eae3 Tweak corporea item frame filter again 2016-01-27 21:19:44 -06:00
Vincent Lee 2071fa16d2 Fix trodden dirt being wonky. Closes #68. 2016-01-27 21:09:15 -06:00
Vincent Lee 75e07e9653 Bump to recommended forge 2016-01-27 20:33:29 -06:00
Vincent Lee 779cc7604c Tweak corporea funnel behavior to accomodate 1.8 item frame changes. Closes #81. 2016-01-26 12:39:32 -06:00
Vincent Lee ad8cf9de8a Blockstate tweak in flowers, pick block fix for tall flowers 2016-01-26 12:18:23 -06:00
Vincent Lee 78308cdb01 Probably should have teh null check first. CLoses #73 2016-01-26 11:35:49 -06:00
Vincent Lee d203cf3fe4 Fix water bowls being unacquirable. Closes #75. 2016-01-26 11:28:39 -06:00
Vincent Lee 9c58319e68 Fix rod of the seas using faulty placement logic that's gone in 1.8. Closes #78. 2016-01-26 11:19:22 -06:00
Vincent Lee a7080b2439 Working! now need to smooth it out 2016-01-25 12:35:39 -06:00
Vincent Lee becc642b85 Animation now correct 2016-01-25 12:25:54 -06:00
Vincent Lee a94a86b9ce Minor hourglass optimization. Closes #76 2016-01-25 10:07:50 -06:00
Vincent Lee 4926137ff0 ITS ALIVE 2016-01-25 09:52:04 -06:00
Vincent Lee 67605075d8 More work on animation api 2016-01-25 09:38:04 -06:00
Vincent Lee 89e00c7ae8 First attempt at animation API 2016-01-25 00:19:04 -06:00
Vincent Lee 7601eecba3 Fix pylons not showing their fancy particles 2016-01-24 18:19:24 -06:00
Vincent Lee 0887f76575 Some cleanup in incense plate tesr, move red string tesr to fasttesr, remove life imbuer tesr 2016-01-24 18:10:41 -06:00
Vincent Lee 79210e484c Delete unneeded LibRenderIDs 2016-01-24 14:18:30 -06:00
Vincent Lee fddf546474 Cleanup and reformat: Delete all ISBRH's and IItemRenderers besides book, reformat to tabs in my new classes, add missing copylefts 2016-01-24 14:15:41 -06:00
Vincent Lee eb7a6aee50 Tweak the bandaid 2016-01-23 23:55:05 -06:00
Vincent Lee 5104ff52d6 Tweak to bandaid 2016-01-23 23:13:59 -06:00
Vincent Lee aee5b8c0c2 Revert "Giant annoying message to see where this happens"
This reverts commit 08fa70e25c.
2016-01-23 22:45:43 -06:00
Vincent Lee 08fa70e25c Giant annoying message to see where this happens 2016-01-23 22:41:20 -06:00
Vincent Lee ac72a5a660 Attempt number 991298 to patch the stupid client crash 2016-01-23 22:36:49 -06:00
Vincent Lee 400bf95a44 Fix some lingering GoG worldgen and rendering issues. Closes #8. 2016-01-23 16:56:30 -06:00
Vincent Lee ba3d9ff9f8 Update garden of glass 2016-01-23 16:44:34 -06:00
Vincent Lee b3a140b8dd Temporary bandaid for thaumcraft brew integration. Closes #69. 2016-01-23 12:50:47 -06:00
Vincent Lee fabedeb31a Bump forge version, improve brewery JEI integration 2016-01-23 12:22:33 -06:00
Vincent Lee 2a738209b7 Revert "Tentative fix for multiblock transparency"
This reverts commit 03cfbfa73e.
2016-01-22 23:47:41 -06:00
Vincent Lee 03cfbfa73e Tentative fix for multiblock transparency 2016-01-22 23:28:46 -06:00
Vincent Lee eece9a08c1 Actually commit spreader blockstate json 2016-01-22 23:20:04 -06:00
Vincent Lee e5ee04113f placeholder model for spreader so it shows in JEI. make monocle use blockstates like it should 2016-01-22 22:32:02 -06:00
Vincent Lee 4bf8fd3b98 Remove some unused states from tiny potato 2016-01-22 21:18:54 -06:00
Vincent Lee 09fb64982a A bunch of more baubles 2016-01-22 20:42:12 -06:00
Vincent Lee b012f5152d Fix fab pools not being special snowflakes (colors same between all) 2016-01-21 23:14:45 -06:00
Vincent Lee 540baa4152 A little debug thign 2016-01-21 23:06:24 -06:00
Vincent Lee 77cd24b58a Merge upstream 2016-01-21 22:04:45 -06:00
Vincent Lee 98620bb1c5 Serverside the distributor. Closes #63 2016-01-21 21:30:22 -06:00
Vincent Lee 071bcefa6f Anotehr hoepful bandaid for all the clientside crashes 2016-01-21 21:23:23 -06:00
Vincent Lee 2a077adb6f Safeguard in the smartmodels. Closes #66 2016-01-21 21:21:26 -06:00
Vincent Lee 3d821e5da4 Fix some recipes not taking vanilla prismarine. closes #62 2016-01-21 21:16:00 -06:00
TheWhiteWolves 275729d54e Popped a null check in onEquipped() to ensure player isn't null, hopefully helps with Issue #1757 2016-01-21 23:13:41 +00:00
TheWhiteWolves adc06dc6ce Added a blacklist to the Rod of the Shaded Mesa 2016-01-21 22:46:02 +00:00
Vincent Lee 5991387f22 Actually close #59 2016-01-20 21:35:14 -06:00
Vincent Lee d0e4e436ad MOve recipes to init and remove thaumcraft after requirement. CLoses #53 2016-01-20 19:52:38 -06:00
Vincent Lee 27be487b7e Add a gradlew.bat. Closes #56 2016-01-20 19:15:46 -06:00
Vincent Lee 36976e6321 Fix divining rod looking up blocks with no item form in the OD. CLoses #57 2016-01-20 19:12:22 -06:00
Vincent Lee a6d89e3d4d Fix thorn chakram impact crash. Closes #59 2016-01-20 19:08:48 -06:00
Vincent Lee ab3bc85f20 Fix magic missile crash. closes #54 2016-01-20 19:07:29 -06:00
Jonathan Smith d8a46650ee Merge pull request #1762 from NatsuArashi/patch-14
Update zh_TW.lang
2016-01-19 14:26:26 +00:00
NatsuArashi 177c5b1d1b Update zh_TW.lang
FIX SOMETHING...?
2016-01-19 19:31:17 +08:00
Jonathan Smith 089c8c674c Merge pull request #1760 from Eladkay/patch-3
Fixed license link in FAQ page.
2016-01-18 16:14:45 +00:00
Eladkay 2df3b356fd Fixed license link in FAQ page.
If issue is not obvious: https://gyazo.com/c4657c529a337f37a3c67925e8e5e61e
2016-01-18 15:00:17 +02:00
TheWhiteWolves a6896f250f bump API version 2016-01-17 14:51:51 +00:00
TheWhiteWolves d431207eec Change to use API version of disposable blocks and implement semi-disposable 2016-01-17 14:51:39 +00:00
TheWhiteWolves c0e7353192 Move disposable blocks list to API and add hook and semi disposable list 2016-01-17 14:50:50 +00:00
Jonathan Smith f2eea3ce92 Merge pull request #1754 from blacksmithgu/swapper-sides
Bugfix followup - Block swappers use sidedness to control concurrency
2016-01-16 11:19:02 +00:00
Michael Brenan 24cf30a29e Bugfix followup - Block swappers use sidedness to control concurrency 2016-01-15 18:28:06 -06:00
Jonathan Smith 5bc520368d Merge pull request #1752 from blacksmithgu/patch-1749
Fix #1749 - Mana Tablets no longer lose durability in storage drawer
2016-01-15 21:28:32 +00:00
Michael Brenan 54f1dd0478 Fix #1749 - Mana Tablets no longer lose durability in storage drawer 2016-01-15 03:26:31 -06:00
Jonathan Smith b7c0c12e5b Merge pull request #1750 from blacksmithgu/swapper-concurrency
Add preemptive bugfix - Swappers now threadsafe
2016-01-15 09:09:26 +00:00
Michael Brenan 5438138c93 Add preemptive bugfix - Swappers now threadsafe 2016-01-14 22:56:01 -06:00
506 changed files with 3814 additions and 4192 deletions

No files matched your search

BIN
View File
Binary file not shown.
+3
View File
@@ -10,6 +10,9 @@ I will EXACTLY match Vazkii/upstream design wise so NEVER ask me for balance or
Please report all 1.8 bugs to MY REPOSITORY, NOT VAZKII'S.
These non-CurseForge builds can be openly used in modpacks of any kind, in accordance with the requirements of the license of this mod.
![](https://github.com/Vazkii/Botania/blob/master/web/img/logo.png)
Welcome to the Botania repository.
Binary file not shown.
Loaded 100 of 506 files, more files were not shown because too many files have changed in this diff. Show more