Compare commits

...
271 Commits
Author SHA1 Message Date
Vincent Lee 4f8376a148 Fix dark quartz disabled crashing client (Renari), other cleanups in modelhandler. Closes #119. 2016-02-18 09:26:16 -06:00
Vincent Lee 9e0c7ba0c7 Cleanup in modelhandler, tweak to caching in corporea cube renderer 2016-02-17 17:49:54 -06:00
Vincent Lee 769ed577c4 Fix a rare crash rendering the debug screen 2016-02-17 16:52:07 -06:00
Vincent Lee 78c65fb065 All apothecaries done finally 2016-02-16 13:34:26 -06:00
Vincent Lee a647f4c784 Mountain apothecary 2016-02-15 16:21:54 -06:00
Vincent Lee 37d63bc672 Remove some top level sideonlys where they werent meant to be used, fix wireframes rendering too opaquely 2016-02-14 22:31:00 -06:00
Vincent Lee 333102a08f Lambdaify shadercallback 2016-02-14 19:13:25 -06:00
Vincent Lee d1ff5e89ca Merge upstream pull request #1693 from Katrix-/relicsUUID 2016-02-14 10:54:35 -06:00
Vincent Lee 9fe4e0f8cc Kinda migrated crystal cuvbe to json 2016-02-13 12:28:52 -06:00
Vincent Lee b6204f9a41 Merge branch 'MC18' of github.com:williewillus/Botania into MC18 2016-02-12 23:07:36 -06:00
Vincent Lee 988e80a3f2 Initial attempt at animated corporea crystal cube 2016-02-12 23:07:21 -06:00
Vincent Lee d1d8eb801c Actually commit the texture 2016-02-12 22:05:22 -06:00
Vincent Lee f7902ae574 Merge pull request #115 from KaseiFR/MC18
Fix RF interaction with the Mana Fluxfield
2016-02-12 20:54:54 -06:00
KaseiFR d7bb959a87 Fix RF integration
Buildcraft pipes are particularly sentitive to directions.
2016-02-13 03:29:14 +01:00
Vincent Lee bef96830bb Pump head texture 2016-02-11 00:29:46 -06:00
Vincent Lee a20e510318 Merge pull request #114 from GirafiStudios/MC18
Updated to official RF API.
2016-02-10 21:26:08 -06:00
GirafiStudios ba944db343 Updated to official RF API. 2016-02-10 20:33:21 +01:00
Vincent Lee d3e1bf80b4 Fix star particle - corporea index and manastorm charge 2016-02-08 22:39:32 -06:00
Vincent Lee 006519bcf5 Slightly nerfed path speed boost 2016-02-08 22:23:23 -06:00
Vincent Lee e522d8e24c comment out debug output 2016-02-08 21:44:04 -06:00
Vincent Lee c7d28c57de Partial fix for platform + smartmodels 2016-02-08 13:03:38 -06:00
Vincent Lee 972d0e5bf6 Safety check in platform model, update JEI 2016-02-08 10:18:12 -06:00
Vincent Lee 2b57a2232d Update lexicon to reflect new corporea funnel item frame values 2016-02-07 22:07:42 -06:00
Vincent Lee b9b066617a Fix floating flower lightlevel crash 2016-02-07 21:55:44 -06:00
Vincent Lee 512884729e Tweak mossy apothecary break texture, fix lexicon crash again 2016-02-07 21:54:11 -06:00
Vincent Lee 2ab491867e Revert "Fix lexicon npe, closes #94"
This reverts commit 6f6f330a5a.
2016-02-07 21:50:53 -06:00
Vincent Lee 3f5159fe75 Mossy apothecary 2016-02-07 19:09:46 -06:00
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
Vincent Lee ebf399edaa Most body based cosmetic baubles 2016-01-18 17:08:31 -06:00
Vincent Lee 4448a6a498 Blood, ice, lava, super lava pendants and itemfinder bauble renders 2016-01-18 15:41:55 -06:00
Vincent Lee a13d6fca53 Sideonly some things 2016-01-18 15:16:48 -06:00
Vincent Lee fef9f1b406 Flugel tiara bauble render 2016-01-18 15:12:57 -06:00
Vincent Lee 86ce88f068 Diva charm and golden laurel baubles render 2016-01-18 14:55:28 -06:00
Vincent Lee 9b2fa9de65 Monocle baubles render 2016-01-18 14:11:21 -06:00
Vincent Lee f87e2373f8 Tiny planet bauble render 2016-01-18 13:22:54 -06:00
Vincent Lee 4df1d500ed Remove unnecessary face from creative pool item json 2016-01-18 12:45:52 -06:00
Vincent Lee cec10471fb Fix two multiblock crashes, closes #48 2016-01-18 12:15:56 -06:00
Vincent Lee 177f50ca61 Bandaid for more client chunk unload crashes >.> 2016-01-18 11:45:07 -06:00
Vincent Lee e184394f55 Fix mana tablets and terrasteel helm will rendering 2016-01-18 11:30:13 -06:00
Vincent Lee eb28396d98 Fully fix contributor fanciness renders. Fix mana gun not being held like a tool in third person 2016-01-18 10:31:05 -06: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
Vincent Lee dda3151b73 Fix piston lens not working properly. Serverside some of the other lenses where safe 2016-01-17 17:30:01 -06:00
Vincent Lee 4e5cb59ebe Fix crash and possible desync in flash lens. Closes #47 2016-01-17 16:41:37 -06:00
Vincent Lee fef0857603 Desert, forest, fungal apothecary textures 2016-01-17 16:31:01 -06: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
Vincent Lee 8922ad5362 Use the non-insane calendar API 2016-01-16 18:38:22 -06:00
Vincent Lee be2b66dddf Partially restore bauble rendering. Everything is probably in the wrong place, but should render. 2016-01-16 18:25:31 -06:00
Vincent Lee 6e870f4e79 Remove some leftover debug messages 2016-01-16 16:57:51 -06:00
Vincent Lee 4d4ba74ac1 Fix ender air bottle event handler not being registered, closes #44 2016-01-16 16:56:17 -06:00
Vincent Lee 5e3345a1d7 Fix terra pick and elementium shovel not working correctly. Closes #43 2016-01-16 13:37:18 -06:00
Vincent Lee 568ee043df God dammit 2016-01-16 12:33:05 -06: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
Vincent Lee a615538289 Stop spamming packets when done digesting 2016-01-16 02:07:18 -06:00
Vincent Lee 7907d1d582 Fix passives decaying directly into nothing instead of a dead bush 2016-01-16 01:57:31 -06:00
Vincent Lee 46900df6cb Serverside gourmaryllis 2016-01-16 01:42:07 -06:00
Vincent Lee 1d8c536139 Fix pool minecart rendery fully 2016-01-15 21:48:29 -06:00
Vincent Lee eb028d6c05 Fully fix mana pool models 2016-01-15 21:20:49 -06: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
Vincent Lee 406f89a968 Cleanup, implement some easter egg models I missed 2016-01-15 14:14:10 -06:00
Vincent Lee 2c15b6150c Lots of MOP guards. closes #41 2016-01-15 11:27:32 -06:00
Vincent Lee bee13337ad Made laputa shard save string block id's instead of integer id's. Also, a possible fix for #40 2016-01-15 10:56:23 -06: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
Vincent Lee 98e28a0967 Made some things one sided only 2016-01-14 22:44:50 -06:00
Vincent Lee 4a4e583aa8 Fix wonky petal apothecary collision 2016-01-14 21:53:18 -06:00
Vincent Lee 300b1926de Possible fix for #38 2016-01-14 17:20:05 -06:00
Vincent Lee 3818d2879d no longer register gaia tesr onto vanilla skulls 2016-01-14 16:47:48 -06:00
Vincent Lee e12163f70c Merge upstream 2016-01-14 16:40:14 -06:00
Vincent Lee dcb236607d Fix hopperhock placing items one block too far away. Closes #39 2016-01-14 12:08:57 -06:00
Vincent Lee 08de553593 No longer use the raw potion array, use potio registry 2016-01-14 11:54:08 -06:00
Jonathan Smith f6bf6589ad Merge pull request #1743 from yrsegal/master
IslandTypes can now be added by addons
2016-01-14 16:59:20 +00:00
Jonathan Smith da43dd8ca0 Merge pull request #1748 from blacksmithgu/patch-1722
Hotfix #1722 - Allow client to control sash speedup and slowdown
2016-01-14 16:55:01 +00:00
Jonathan Smith fdd1ad8d4e Merge pull request #1747 from blacksmithgu/patch-1726
Fix #1726 - Accessories on other players now render in the proper position
2016-01-14 16:54:53 +00:00
Jonathan Smith d4dd4cf42f Merge pull request #1746 from blacksmithgu/gaia-head
Clean up common/item/ItemGaiaHead.java
2016-01-14 16:54:46 +00:00
Michael Brenan 0595397943 Hotfix #1722 - Allow client to control sash speedup and slowdown 2016-01-13 23:07:47 -06:00
Michael Brenan d0faf3c3c6 Fix #1726 - Accessories on other players now render in the proper position 2016-01-13 22:53:21 -06:00
Vincent Lee b01e9dfed7 Staging changes would be a good idea. Also fix possible potion crash 2016-01-13 17:14:12 -06:00
yrsegal cbac5fbb32 IslandTypes can now be added by addons 2016-01-13 17:44:47 -05:00
Michael Brenan f5210997ca Clean up common/item/ItemGaiaHead.java 2016-01-13 16:21:47 -06:00
Vincent Lee 4b7608fc2a Add nag that this is unofficial right now 2016-01-13 14:13:19 -06:00
Vincent Lee 103efe9c7b Destitch cocoon texmap 2016-01-13 12:54:02 -06:00
Vincent Lee 1402e2a50a Start work on destitching apothecary texmaps 2016-01-13 12:37:15 -06:00
Vincent Lee c8d9764fe3 Read atlas size dynamically 2016-01-13 10:59:10 -06:00
Jonathan Smith d3055c4c4d Merge pull request #1742 from blacksmithgu/patch-1700
Fix #1700 - Terra Axe strictly follow 32 block range and leaf logic
2016-01-13 12:24:40 +00:00
Jonathan Smith c94df0bf67 Merge pull request #1738 from blacksmithgu/master
Fix #1728 - Grass seeds will not spread to dirt/grass blocks under other blocks
2016-01-13 12:24:32 +00:00
Michael Brenan 4abb2cdd89 Fix #1700 - Terra Axe strictly follow 32 block range and leaf logic 2016-01-13 03:42:32 -06:00
Jonathan Smith cabcab80e2 Merge pull request #1739 from blacksmithgu/patch-1724
Fix #1724 - Slabs and snow don't prevent Rod of Shifting Crust replacement
2016-01-13 09:36:21 +00:00
Vincent Lee 3e19a84b6d Fix terra shatterer tooltip darkening screen. Closes #37 2016-01-13 00:42:32 -06:00
Vincent Lee a30887d6f9 Debug thing for me, to dump the texture atlas 2016-01-13 00:02:18 -06:00
Vincent Lee 80bd63be0b Bunch of TE particle textures. Fix a bellows crash and teru teru bozu not working with sunflower 2016-01-12 23:27:36 -06:00
Vincent Lee 6c9a01978a Cocoon of caprice model 2016-01-12 15:04:08 -06:00
Vincent Lee 19e387f359 Fix off by one in forest drum meta to state 2016-01-12 13:58:19 -06:00
Vincent Lee f799f7bc32 Revert "Trying to render AO pool"
This reverts commit d8a74e2e44.
2016-01-12 12:00:29 -06:00
Jonathan Smith a2f1776245 Merge pull request #1735 from yrsegal/master
Make baubles able to IBlockProvide
2016-01-12 12:59:05 +00:00
yrsegal c20247b680 Baubles now able to IBlockProvide
This allows for things like Botanical Addons’ Toolbelt to provide from
the tools in them while worn.
2016-01-12 07:47:30 -05:00
Jonathan Smith a7000e8a47 Add Material.gourd to Axe materials.
Closes #1732. 

Allows use of the quickest mining tool for items with Material.gourd (Pumpkins, Melons, etc.)
2016-01-12 12:12:20 +00:00
Michael Brenan ac88d0627a Fix #1724 - Slabs and snow prevent Rod of Shifting Crust replacement 2016-01-12 01:32:15 -06:00
Vincent Lee d8a74e2e44 Trying to render AO pool 2016-01-11 20:06:59 -06:00
Michael Brenan cbcc49b896 Fix #1728 - Pasture seed grass spreading obeys grass block growth rules 2016-01-11 18:28:01 -06:00
Vincent Lee 30578abfb4 Merge pull request #36 from GirafiStudios/MC18
Fixed special named Tiny Potatoes. (Besides Ible)
2016-01-11 17:14:30 -06:00
GirafiStudios a172a325e1 Fixed named Tiny Potatoes rendering (Besides Ible) 2016-01-11 23:45:43 +01:00
Vincent Lee 64e3a96651 I is retarded 2016-01-11 14:25:00 -06:00
Vincent Lee 94d72161a9 Revert mesher lambdas 2016-01-11 14:10:11 -06:00
Vincent Lee 8e7f1cfac1 Temporary java 8 reobfuscation fix closes #33. 2016-01-11 11:23:46 -06:00
Vincent Lee f3cce3d24e Global safety checks for blockstates while chunks are unloading 2016-01-10 22:53:21 -06:00
Vincent Lee 84204db587 Fix ender air bottle render, move to java 8, giant import cleanup 2016-01-10 18:16:30 -06:00
Vincent Lee 404d99445e Sleeves render on spreaders again. Closes #6 2016-01-09 23:35:18 -06:00
Vincent Lee f3f055a58e More 2016-01-09 21:26:43 -06:00
Vincent Lee e142561799 Model cleanup 2016-01-09 21:22:37 -06:00
Vincent Lee 14a7f6b14b COrrect Crafty crate models 2016-01-09 21:01:50 -06:00
Vincent Lee a6899a9f40 Special flower lighting crash 2016-01-09 19:31:58 -06:00
Vincent Lee 57398723a4 Cleanup 2016-01-09 19:05:37 -06:00
Vincent Lee 4345bd9728 More blockstate guards in TE and blockstate conversions 2016-01-09 19:01:31 -06:00
Vincent Lee 1c14dcf8ff Fix pylon crash 2016-01-09 18:37:12 -06:00
Vincent Lee 7615d0b893 Fix recipes for 1.9 purpur not being registered 2016-01-09 17:49:59 -06:00
Vasco Lavos b7975401b3 Merge pull request #1727 from yrsegal/master
Make CanFit (IFlowerComponent) affect items fitting into petal apothecary
2016-01-09 22:36:57 +00:00
yrsegal f641e165b0 actually call canFit 2016-01-09 17:35:14 -05:00
Vincent Lee 568ed80ede Allow platform to render other smart models 2016-01-09 00:03:04 -06:00
Vincent Lee c3dce97e0d Fix pylon and pool rendering in multiblock. Closes #25 2016-01-08 23:03:30 -06:00
Vincent Lee 61b8616008 Fix double flowers not dropping from both halves. Closes #24 2016-01-08 20:34:55 -06:00
Vincent Lee f61d47f2dc Some cleanup, fix wand of the forest minor bugs. Closes #22 2016-01-08 19:53:28 -06:00
Vincent Lee 9e16c4490b Rename RenderEventHandler, restore flugel tiara extra renders, and fix sparkles renderirng too low. Closes #21 2016-01-08 19:10:28 -06:00
Vincent Lee b4df8ce418 Full platform models. Fix bore lens crash and add copyleft headers to some things 2016-01-08 18:47:31 -06:00
Jonathan Smith 7e5974cd7c Merge pull request #1721 from AlterAkima/patch-2
Brew related pages
2016-01-08 21:33:08 +00:00
Vincent Lee 84d0c75605 Fix lighting, AO is still broken 2016-01-08 14:56:16 -06:00
Vincent Lee 9c3a042089 pool tesr now uses baked model 2016-01-08 14:14:17 -06:00
Vincent Lee a1aa50b532 Merge upstream release 248 2016-01-08 12:34:51 -06:00
Vincent Lee 972943a9ac Updates to internal handler and icons 2016-01-08 12:33:49 -06:00
Vasco Lavos 6374b01762 Build 248 2016-01-08 18:22:07 +00:00
Vincent Lee a4a77fb20f Merge upstream 2016-01-08 12:00:01 -06:00
Vincent Lee 3a54166954 Revert "Tentatively change relics to use UUID. Still use playernames for display" due to a better solution being merged upstream.
This reverts commit 0687f56c32.
2016-01-08 11:29:03 -06:00
Patric Alexandre 753a03b291 Brew relataded pages 2016-01-08 14:04:34 -03:00
Vasco Lavos bf55ee4a60 Fixed the Hopperhock calling inventory methods on the client side, and thus, crashing when used alongside a BetterStorage Crate. 2016-01-08 14:41:05 +00:00
Vasco Lavos 68ea0b213e Fixed alternate grass types not breaking faster with a shovel and not being able to sustain sugar cane. Closes #1711 2016-01-08 14:35:06 +00:00
Vasco Lavos 6b66163958 Fixed the Ring of Odin Fire Resistance config not changing its extinguish behaviour. 2016-01-08 14:32:29 +00:00
Vasco Lavos c8517f565b Fixed Mana Flashes not having a lexicon binding. Closes #1719 2016-01-08 14:30:55 +00:00
Vasco Lavos 8268c79353 New name 2016-01-08 14:27:53 +00:00
Vasco Lavos c00bb80529 Merge pull request #1712 from Lazersmoke/18-oredictstonefix
Add oredict support 1.8 stone recipes, closes #1660
2016-01-08 14:22:48 +00:00
Vincent Lee cd77b41d31 Incense plate converted to json 2016-01-07 21:19:39 -06:00
Vincent Lee 20b5743221 Safety guards for blockstates, remove all useless casts 2016-01-07 19:55:54 -06:00
Vincent Lee e58eb1b345 Fix alfportal derp 2016-01-07 17:03:28 -06:00
Vincent Lee 064fd20edb Mana flash and water bowl items 2016-01-07 16:56:03 -06:00
Vincent Lee 85102dea89 Mana inkwell item model. Pylon models fully working 2016-01-07 14:32:38 -06:00
Vincent Lee baf14c361b Fix third person render 2016-01-07 11:59:22 -06:00
Vincent Lee 3b7d7628cf Derp 2016-01-07 11:46:36 -06:00
Vincent Lee 8155dc3059 Life imbuer model complete 2016-01-07 11:35:41 -06:00
Vincent Lee 0494c0eba2 Generify stuff, fix gaia head render, hourglass inventory model 2016-01-07 10:32:51 -06:00
Vincent Lee 12dfecb8ac Add a bunch of dirty, dirty tesr item hook items. Also fix fabulous mana pool leaking its fabulousness 2016-01-07 08:52:58 -06:00
Vincent Lee 92aaa9f70a Spreader turntable model 2016-01-06 21:40:18 -06:00
Vincent Lee 929860f8fa Partial claw model. Fix cell block being a debug floating island. Fix a pure daisy oredict bug by checking for drops instead of state 2016-01-06 20:56:25 -06:00
Vincent Lee 383cd059cc Fix hourglass having inverted redstone power. How come no one caught this?! 2016-01-06 20:16:22 -06:00
Vasco Lavos b108af404f Update contributors.properties 2016-01-06 22:23:28 +00:00
Vincent Lee 2ddf71d76f Cleanup 2016-01-05 21:41:07 -06:00
Vincent Lee 34fae04641 Made API dediserver-safe. Remove icon methods from SubTileSignature. 2016-01-05 21:39:56 -06:00
Vincent Lee dc6af948d9 Don't use a sideonly client method. Closes #18 2016-01-05 21:23:50 -06:00
Vincent Lee 3fe2a0006c Change crystal bow draw animation to better reflect when it's fully charged 2016-01-05 19:51:41 -06:00
Vincent Lee 89dac440c8 Change starfield item model to match upstream 2016-01-05 19:27:54 -06:00
Vincent Lee 5797d18d9b Fix a bunch of coloring mistakes. Fix flower particles because I'm dumb 2016-01-05 19:24:30 -06:00
Vincent Lee 52cf3df27e Fix tessellator bugs, fix alf portal crash 2016-01-05 17:15:22 -06:00
Vincent Lee b976ed5df1 Cleanup JEI integration, add copyleft. 2016-01-05 17:01:46 -06:00
Vincent Lee e727cb7f2b Merge branch 'jei' into MC18 2016-01-05 16:51:18 -06:00
Vincent Lee 8e6dc7c637 JEI integration complete (runic altar, mana infusion) 2016-01-05 16:51:03 -06:00
Vincent Lee 28249d1e33 Elven trade integration 2016-01-05 15:36:10 -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
Jonathan Smith d7f94bfc00 Merge pull request #1715 from yrsegal/master
Make the render color for camo blocks work with meta
2016-01-05 16:30:26 +00:00
Vincent Lee 86880bfd49 Fix helmet of revealing inv model 2016-01-05 00:05:09 -06:00
Vincent Lee c8c50f9af0 Future is now part 1: conversions recipes to vanilla 2016-01-04 23:29:50 -06:00
Vincent Lee 0e301a4e33 Fix apothecary light level crash, tiny potato render crash. Closes #17 2016-01-04 22:47:47 -06:00
Vincent Lee 10d095d656 Finish pure daisy integration 2016-01-04 22:46:24 -06:00
Vincent Lee 9bf2e0c555 Semi working petal apothecary itnegration 2016-01-04 22:34:45 -06:00
Vincent Lee 95118696ce Half complete petal apothecary 2016-01-04 20:57:14 -06:00
Vincent Lee ab4f6f6433 workaround for pylon enchant power. closes #16 2016-01-04 19:58:54 -06:00
yrsegal 69eac1f12e Make the render color for camo blocks work with meta
before, blocks which required meta colors for determining their render
color would use the meta of the Platform itself
2016-01-04 19:39:50 -05:00
Vincent Lee 46c13be698 Fix rotations and nameplates for tiny potato 2016-01-04 14:09:18 -06:00
Vincent Lee ad58fb1855 Partial tiny potato 2016-01-04 12:18:19 -06:00
Vincent Lee 12ae7ed3d1 Fix thaumcraft integration crashing 2016-01-04 10:01:04 -06:00
Jonathan Smith 0cd4722c1c Merge pull request #1710 from Lazersmoke/pane-lighting
Added light to all panes, closing #1697
2016-01-04 10:14:52 +00:00
Jonathan Smith e89322083d Merge pull request #1713 from Lazersmoke/lens-recipe-fix
Fixes mana lens dyeing, closing #1708
2016-01-04 10:14:21 +00:00
Vincent Lee 6cf82eb98d Rudimentary pure daisy integration 2016-01-03 23:43:24 -06:00
Vincent Lee b10a642297 Brewery recipe support 2016-01-03 22:02:02 -06:00
Vincent Lee 75ab210227 Item models fully working. TESRs may be changed in future 2016-01-03 19:59:27 -06:00
Vincent Lee 0b27d9d0b5 Attempt at json pool model 2016-01-03 19:29:09 -06:00
Vincent Lee 3c102bbc75 Move mc dep ver out of @Mod 2016-01-02 23:32:55 -06:00
Vincent Lee 4e1065855e Some formatting cleanups. Add copyleft header to all new classes 2016-01-02 23:21:55 -06:00
Sam Quinn f9ce3676e1 Fixes mana lens dyeing, closing #1708
Fixes having extra items beyond a dye and a lens messing everything up
2016-01-02 22:48:51 -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
Sam Quinn 124f8bb173 Added light to all panes, closing #1697
All the full glass blocks had lightning, so now these can too!
2016-01-02 20:14:44 -06:00
Vincent Lee 3eb67e3fea Corporea index and cube item model 2016-01-02 19:43:41 -06:00
Vincent Lee 5d80b7d9ce Fix thaumcraft 5 goggles of revealing integration. closes #14 2016-01-02 19:07:52 -06:00
Vasco Lavos 820c042f40 Update contributors.properties 2016-01-02 23:42:17 +00:00
Vincent Lee f7e5054bf4 Fix armor rendering - thanks primetoxinz for the find! 2016-01-01 16:05:17 -06:00
Vincent Lee 906fb74ec0 Fix santaweave inv icons 2016-01-01 15:35:08 -06:00
Vasco Lavos 0f9bc9fc53 Merge pull request #1706 from Lazersmoke/patch-7
Removed references to Excaliber
2016-01-01 16:43:58 +00:00
Sam Quinn 9036e24365 Removed references to Excaliber
The Excalibru doesn't even exist anymore, so it doesn't make sense to talk about it in contributing, as you should be working with latest version anyway
2016-01-01 09:52:51 -06:00
Katrix- d1c309f8ae UUID for relics
Maybe better name for a few uuid methods?
2015-12-27 03:44:40 +01:00
980 changed files with 9679 additions and 6559 deletions

No files matched your search

BIN
View File
Binary file not shown.
+2 -9
View File
@@ -10,9 +10,10 @@ Anyways, vanilla removed it from their method so we follow suit.
* Multiblock system reworked to use states and blockposes
* Magnet blacklist still uses metas instead of states because they need to support the short maxvalue wildcard.
* Now includes a way for addons to pass the Botania loader the models they want to use to render their subtile with
* IRelic changed to use UUIDs
* Removed icon methods from SubTileSignature
-- Other --
* Lang entries to be updated in non-english: Corporea funnel new numbers. Moving of prismarine entry.
* Most things left untouched to make patches from upstream easier
* Most uses of chunkcoordinates directly convert blockpos (THANK YOU VAZKII FOR USING THEM). Remove creation of extra instances
since BlockPos'es are immutable and thus can be reused everywhere.
@@ -26,11 +27,3 @@ sorry :/ The systems needed to dynamically switch out the textures like that is
* Glass pane inner faces are not getting culled (vanilla bug?)
* Some item forms of technical/non-user blocks are removed
* Full list: [all double slab items, all solid vine items]
-- Todo --
* JSON models for everything (tedious/med-hard)
* Migrate the PlayerRender events (baubles, etc.) to LayerRenderers (med)
* For rendering arbitrary icons (that DO NOT HAVE AN ITEM) in a 3D style (manaResource icons, etc.)
- Sub to texture stitch and bake our own model there to use?
- This remains the largest portion of what is left
- Where is the method to render an arbitrary baked model?
+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 980 files, more files were not shown because too many files have changed in this diff. Show more