Compare commits

...
Author SHA1 Message Date
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
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
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
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
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
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
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
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
Vincent Lee b01e9dfed7 Staging changes would be a good idea. Also fix possible potion crash 2016-01-13 17:14:12 -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
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
Vincent Lee d8a74e2e44 Trying to render AO pool 2016-01-11 20:06:59 -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
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
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
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
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
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
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
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
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
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
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
Vincent Lee 48cf387682 Unssuccessful attempt to fix sky renderer leaking state. Mark for release 2015-12-31 14:28:13 -06:00
Vincent Lee c54b85dfd5 Cacophonium block model 2015-12-31 13:34:09 -06:00
Vincent Lee bd98879d49 Fix piston relays 2015-12-31 13:13:32 -06:00
Vincent Lee b3a83031c1 Misc rendering fixes 2015-12-31 12:45:18 -06:00
Vincent Lee c8d4c54ed7 Bandaid for one block off multiblock render 2015-12-30 23:47:16 -06:00
Vincent Lee 9ee02b55ad Fix bifrost rod, gateway core and root model 2015-12-30 23:37:49 -06:00
Vincent Lee 2cc7e133cc fluxfield model, fix pump crash, fix gaia render 2015-12-30 22:25:08 -06:00
Vincent Lee 0c062967a0 Mana Bomb, Mana Detector 2015-12-30 21:23:54 -06:00
Vincent Lee 1cf175d412 Baubles and stuff 2015-12-30 20:56:50 -06:00
Vincent Lee 5293f811c8 Fix king key weapon and item render 2015-12-30 19:34:14 -06:00
Vincent Lee c5a5657810 Missed some >.> also a teeny bit of attribution that probably won't even show up because it runs off the screen 2015-12-30 18:33:56 -06:00
Vincent Lee 4dd62fae37 Corporea blocks, luminizers, comment out nei and cbmp stuff so it can actually build. 2015-12-30 18:27:06 -06:00
Vincent Lee a67aeee496 SPark changer, terrasteel plate, fix spark entity render 2015-12-30 14:51:14 -06:00
Vincent Lee c2470f80ee Fixes so server works 2015-12-30 13:11:18 -06:00
Vincent Lee b4300a9e3b Corporea item icons (world render broken still). Temp fix for pylon multiblock rendering. 2015-12-30 00:55:21 -06:00
Vincent Lee 9f5455aa9f Let it run on 1.8.8 as well. 2015-12-29 23:47:28 -06:00
Vincent Lee 37b5d00388 Update to 1.8.9, fix apothecary collision 2015-12-29 23:45:26 -06:00
Vincent Lee 1973779897 Petal apothecaries fully restored 2015-12-29 22:37:19 -06:00
Vincent Lee 71607ae3bd Merge release build 246 2015-12-29 19:36:50 -06:00
Vincent Lee 965ab01889 Fix the textures 2015-12-29 14:56:19 -06:00
Vincent Lee 5a630fbf39 Done with floating flowers completely. Can't get the spinning right though. 2015-12-29 14:45:50 -06:00
Vincent Lee 3aef9efe8b Floating flowers kinda sorta mostly working 2015-12-29 00:34:13 -06:00
Vincent Lee 8f70814ae6 Partially working floaters 2015-12-28 22:21:22 -06:00
Vincent Lee 43cd84d2cd Fix multiblock rendering and enchanter activation bug 2015-12-28 19:11:20 -06:00
Vincent Lee 2f0915e18c Lots more item models, red string block models 2015-12-28 17:50:33 -06:00
Vincent Lee 8eedaa5563 Fix texture errors, fix pool and apothecary collision detection 2015-12-28 16:11:01 -06:00
Vincent Lee b701f197ee Some progress on floating flowers 2015-12-28 14:17:10 -06:00
Vincent Lee bf07f10ac7 Fix brewery rendering and operation 2015-12-27 22:38:26 -06:00
Vincent Lee 90fcc98bd0 Fix wisp particle 2015-12-27 20:33:24 -06:00
Vincent Lee c513f17f88 All brews, mana tablet, mana gun, incense, and other items 2015-12-27 20:16:31 -06:00
Vincent Lee e83d1600cf Blood pendant, enchanted soil, enchanter, open bucket, prism, fix some rendering 2015-12-27 16:52:30 -06:00
Vincent Lee 5b1ac0368d Quartz, prismarine, various items, fix upper slab uvlock 2015-12-27 15:39:45 -06:00
Vincent Lee 65837fbf38 Punt on apothecary. Items first 2015-12-27 12:52:02 -06:00
Vincent Lee 33a8d5e33c Done with apothecaries for today >.> 2015-12-27 01:51:06 -06:00
Vincent Lee b740a22684 Fix old tex, temporary json 2015-12-27 00:42:24 -06:00
Vincent Lee 7c41ffcaa1 Destitched model files 2015-12-27 00:26:41 -06:00
Vincent Lee 781f586d19 Upload some files so I can use modelcreator in windows >.> 2015-12-26 21:55:32 -06:00
Vincent Lee 794e1352e8 Lenses and lens rendering on spreader 2015-12-26 20:00:34 -06:00
Vincent Lee f449fca882 Actually commit this time 2015-12-26 17:41:50 -06:00
Vincent Lee 73663e8a0a Fix rod models, made runic altar and avatar render their items 2015-12-26 17:38:07 -06:00
Vincent Lee 86cd656360 Merge branch 'MC18' of github.com:williewillus/Botania into MC18 2015-12-26 16:27:00 -06:00
Vincent Lee 20b433af3c Merge pull request #2 from primetoxinz/MC18
More Item Models :D
2015-12-26 16:22:09 -06:00
Vincent Lee 5fe696875f More various models 2015-12-26 16:21:21 -06:00
primetoxinz 18dceeeb5f fix for merge 2015-12-26 16:43:32 -05:00
Tyler ccbf325a76 Merge pull request #2 from williewillus/MC18
Merge
2015-12-26 16:32:18 -05:00
Vincent Lee 2f4785c7b4 Clean up flower and mushroom jsons 2015-12-26 12:35:46 -06:00
Vincent Lee e2ac5ecad1 Fix double flowers fully, a couple more models 2015-12-26 00:49:30 -06:00
Vincent Lee 8cda41cdb8 Finish walls, and ALL slabs. Made floating flowers render properly in world. 2015-12-25 22:44:10 -06:00
Vincent Lee b36f51f6d8 Clean up a ton of models, add some walls 2015-12-24 22:00:24 -06:00
Vincent Lee 32fe7f6ce3 Fix landing and break particles in specail flowers 2015-12-24 15:05:52 -06:00
Vincent Lee 0687f56c32 Tentatively change relics to use UUID. Still use playernames for display 2015-12-24 14:42:52 -06:00
Vincent Lee 70d4450a6a Wand of the Forest, Fel pumpkin, trodden path 2015-12-24 14:00:11 -06:00
Vincent Lee dcd08963e9 Special item models 2015-12-24 12:33:25 -06:00
Vincent Lee 23cab39892 All special flowers. item model system not yet done 2015-12-24 11:05:00 -06:00
Vincent Lee f4ea60ba2c IT WORKS 2015-12-24 03:04:16 -06:00
Vincent Lee 319bab35a0 Lay all groundwork for special flower models. Not yet tested. 2015-12-24 02:14:21 -06:00
Vincent Lee d58f153742 Solid vine and crash fixes for it 2015-12-23 23:54:59 -06:00
Vincent Lee 64a8dfbcfe Drums, runic altar, mana pool kinda, distributor, force relay, starfield 2015-12-23 20:26:33 -06:00
Vincent Lee eabb0f94e3 Mana beacon, unstable block, petal block 2015-12-23 17:19:23 -06:00
primetoxinz d23cca33e1 More Item models 2015-12-23 17:07:32 -05:00
Tyler cbbefff0ce Merge pull request #1 from williewillus/MC18
merge
2015-12-23 17:03:30 -05:00
Vincent Lee cfaeecc41a Panes, and fixes so no crashes in debug world 2015-12-23 16:03:07 -06:00
Vincent Lee 0887191a64 All stair models done 2015-12-23 14:30:18 -06:00
Vincent Lee b10615c909 Revert unnecessary changes 2015-12-23 00:42:00 -06:00
Vincent Lee 2c660ba82b Merge branch 'primetoxinz-MC18' into MC18 2015-12-23 00:40:40 -06:00
Vincent Lee 92e90ed2b9 Merge branch 'MC18' of github.com:primetoxinz/Botania into primetoxinz-MC18 2015-12-23 00:39:40 -06:00
Vincent Lee 3d41be585b Pylons kinda working 2015-12-22 23:26:27 -06:00
Vincent Lee 57e5a3d0ac Pylon obj model possibly. item working, tile not so 2015-12-22 22:47:29 -06:00
primetoxinz 1b1e5e3bf0 Fixed Formatting 2015-12-22 23:34:35 -05:00
primetoxinz 7e0145bf34 remove debug code, whoops 2015-12-22 23:17:09 -05:00
primetoxinz e77678593f remove launch files 2015-12-22 23:09:21 -05:00
primetoxinz 9f429c7e17 Added most tools and armour models 2015-12-22 23:06:33 -05:00
primetoxinz 305b99b3f5 Added Models for Resources and other items 2015-12-22 22:37:27 -05:00
Vincent Lee 33b423aaa1 Lexicon item model. Alf/managlass blocks, altgrass 2015-12-22 20:28:14 -06:00
Vincent Lee d2340905d6 Livingwood, and livingrock and livingwood stairs 2015-12-22 17:43:51 -06:00
Vincent Lee 70353cf143 Livingrock, and reorganize model names. Sorry for the diff thrashing 2015-12-22 16:48:56 -06:00
Vincent Lee 42110cec45 Fix duplicate eventhandler 2015-12-22 16:18:34 -06:00
Vincent Lee cff6120aaf First block models 2015-12-22 16:16:04 -06:00
Vincent Lee 56228446b8 Stub out all rendering. Compiles and runsgit add -A 2015-12-22 12:49:18 -06:00
Vincent Lee b21d6f5ee6 All non rendering components compile 2015-12-22 11:13:23 -06:00
Vincent Lee 0db00970ab Made futurestone registration a bit less hardcody 2015-12-21 22:44:11 -06:00
Vincent Lee 320f6405e4 Rendering tweaks, and fix up all stairs/slabs/walls 2015-12-21 22:40:52 -06:00
Vincent Lee a23f317368 Finish BC integratoin 2015-12-21 19:49:51 -06:00
Vincent Lee 5379cda754 Update buildcraft api to 7.2.0 and integration mostly 2015-12-21 19:44:52 -06:00
Vincent Lee a9b060257f 1.8.8 tess fixes, potential double plant fix, bunch of reflectoin in spawner claw 2015-12-21 19:25:58 -06:00
Vincent Lee 5d666cd891 Some 1.8.8 tessellator changes 2015-12-21 13:53:31 -06:00
Vincent Lee ffe7b4ccc8 API looks to be good again 2015-12-21 13:01:33 -06:00
Vincent Lee c480a3303a Remove unneeded casts since 1.8.8 restores generics 2015-12-21 12:53:59 -06:00
Vincent Lee dbb549ba2a Merge upstream release 245 2015-12-21 12:47:58 -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
Vincent Lee 6b03424e2c Commit before merging upstream 2015-12-14 12:46:31 -06:00
Vincent Lee 8361d1743d Some rendering experiements, update notes 2015-11-30 12:53:36 -06:00
Vincent Lee 6cc88f1c5a Almost done with TEs 2015-11-29 16:45:36 -06:00
Vincent Lee 4736be9d61 Corporea done 2015-11-29 15:59:17 -06:00
Vincent Lee e4864d2e7b Red string blocks and tiles 2015-11-29 15:26:59 -06:00
Vincent Lee d0a14a451b More IIcon exorcisms, various compilation fixes now that we know states 2015-11-29 15:06:03 -06:00
Vincent Lee f58440b79a Misc cleanups and fixes. All magic flowers compile now! 2015-11-29 12:59:22 -06:00
Vincent Lee 9ea899bad5 Fix alf portal states, made the api compile now! 2015-11-28 20:54:09 -06:00
Vincent Lee e4b58e0c2d Remove InterpolatedIcon. Now present natively in 1.8 2015-11-28 19:57:33 -06:00
Vincent Lee a9baf71924 TESRs and fixed quite a few todos 2015-11-28 19:55:12 -06:00
Vincent Lee 4a4763b075 Light work on decor 2015-11-27 22:58:18 -06:00
Vincent Lee 1817e75b5d More decor states 2015-11-27 13:04:23 -06:00
Vincent Lee 6c637d27b2 Lots of rendering work. Multiblock structures migrated from to states 2015-11-26 22:14:46 -06:00
Vincent Lee e679a2062d Misc touchups everywhere. Move ModBanners in block pkg 2015-11-26 17:33:36 -06:00
Vincent Lee bf81e002e8 More blockstates 2015-11-26 12:03:33 -06:00
Vincent Lee a40a443607 Merge upstream 2015-11-26 02:27:25 -06:00
Vincent Lee ddf2a94aa1 Some states in the root package. here we go! 2015-11-26 02:18:20 -06:00
Vincent Lee 2dae52a9ff Full GLStatemanager substitution 2015-11-26 00:50:46 -06:00
Vincent Lee 9cd7a4a0d5 Tweak multiblocks a bit 2015-11-26 00:20:11 -06:00
Vincent Lee 0a7268fc98 Move botaniaStateProps and all state enums into the api so others can use them to set our blockstates 2015-11-26 00:09:29 -06:00
Vincent Lee 4426f8904f Some touchups on entities 2015-11-25 01:36:21 -06:00
Vincent Lee c0bcfb6448 Most functional flora 2015-11-24 17:31:19 -06:00
Vincent Lee b4d9c3ded8 Some of genereating flora 2015-11-24 01:10:03 -06:00
Vincent Lee 605e38337a Rest of root package TE 2015-11-24 00:49:57 -06:00
Vincent Lee b72be67dd7 Smaller TE's in the root package. several of the bigger ones left 2015-11-22 23:56:18 -06:00
Vincent Lee c2f1a9ab17 corporea, mana, and string tile entities 2015-11-22 16:19:02 -06:00
Vincent Lee 999705294d root package of block, first pass done 2015-11-22 15:28:50 -06:00
Vincent Lee 3fe15e6b7d Remove trivial IIcon refs in Item to get a better sense of my progress there 2015-11-21 23:12:46 -06:00
Vincent Lee 921370b546 block. corporea, dispenser, mana, string. some of the base pkg too 2015-11-21 22:53:58 -06:00
Vincent Lee 3f9d5c888f Finish rods (a bit of block leaked in, oops) 2015-11-20 18:36:01 -06:00
Vincent Lee 55bf02798d Most of rod package 2015-11-20 13:45:35 -06:00
Vincent Lee e3b22975cb Merge upstream 2015-11-20 01:00:31 -06:00
Vincent Lee 3ebcd10233 Finish ring of Loki 2015-11-20 00:53:35 -06:00
Vincent Lee 02ed9f1c84 Finish tools and relics except some of Loki 2015-11-18 19:07:37 -06:00
Vincent Lee 27126c074d Some of tool package 2015-11-18 18:39:52 -06:00
Vincent Lee 8cc23c7fb3 Update readme 2015-11-18 08:38:20 -06:00
Vincent Lee 9cbd2708db Base item package, tc interaction items 2015-11-18 08:33:32 -06:00
Vincent Lee 4c0922f0b4 Update Botania refs to TC api 2015-11-18 01:04:51 -06:00
Vincent Lee ed75f4a4b7 Delete parts of TC5 api that actually weren't needed. Oops. 2015-11-18 01:01:46 -06:00
Vincent Lee 5c98dc562c Update RF API to Progressive Automation / FluxDucts' variant 2015-11-18 00:54:48 -06:00
Vincent Lee da1dc51202 Update to TC5 API 2015-11-18 00:49:52 -06:00
Vincent Lee 2376287dd7 Some items 2015-11-17 13:09:45 -06:00
Vincent Lee 750276db9b Merge upstream 2015-11-17 01:07:15 -06:00
Vincent Lee 58dbb0f9cf Lenses, materials, records, relics, equipment 2015-11-17 01:03:09 -06:00
Vincent Lee 6fb9b0101e Some entities 2015-11-17 00:30:32 -06:00
Vincent Lee 3b8926c24b Easy stuff in common.core 2015-11-16 16:37:03 -06:00
Vincent Lee bbbe93a8de common.lexicon 2015-11-16 13:40:19 -06:00
Vincent Lee 9da9d61880 break from client for now 2015-11-16 13:35:58 -06:00
Vincent Lee 29e42d86ea Some of client.render.tile 2015-11-16 13:15:32 -06:00
Vincent Lee 88ca096ae0 client.gui.lexicon 2015-11-14 19:48:26 -06:00
Vincent Lee b07cac07a0 Fix the ctors oops 2015-11-14 15:50:23 -06:00
Vincent Lee afb9650b12 Update EntityThrowableCopy to 1.8 ver 2015-11-14 15:49:58 -06:00
Vincent Lee a1c3b00ae0 client.core.fx 2015-11-14 12:28:02 -06:00
Vincent Lee b22e485217 Some of client.core.handler. Most of this will need to be migrated to layerrenderers 2015-11-14 12:21:30 -06:00
Vincent Lee 7ad1820fcb Low hanging fruit: core.world, core.network, core.lib, core.crafting, some miscs 2015-11-14 00:59:47 -06:00
Vincent Lee 8591551a1b Lots of tessellator substitutions, full findreplace from CC to BlockPos. Some low hanging fruit in client 2015-11-14 00:39:42 -06:00
Vincent Lee 4d674da1b7 Most of what I can do with API done. 2015-11-14 00:28:00 -06:00
Vincent Lee d293a7dcc7 update readme 2015-11-13 20:22:39 -06:00
Vincent Lee 920324b135 Much of the API (blockpos and enumfacing, some low hanging fruit). Not done with it yet though. 2015-11-13 20:19:29 -06:00
Vincent Lee 67d5d65902 Shotgun tile.getWorldObj into tile.getWorld. May cause some individual errors but fix later 2015-11-13 19:53:37 -06:00
Vincent Lee f6cfeedd1d Vec3 and AABB factory to plain ctor 2015-11-13 19:51:23 -06:00
Vincent Lee 5a11a58346 cpw.mods.fml to net.minecraftforge.fml 2015-11-13 19:50:23 -06:00
Vincent Lee da2e5dfa51 Update build.gradle 2015-11-13 19:49:41 -06:00
1885 changed files with 32939 additions and 16167 deletions

No files matched your search

Binary file not shown.
BIN
View File
Binary file not shown.
+28
View File
@@ -0,0 +1,28 @@
-- API --
* Updated to BlockPos and EnumFacing everywhere where it made sense
* Registering repainting blocks will need to also receive a PropertyEnum with EnumDyeColor as the component type
so Botania knows what property to set the color on
* ICorporeaSpark.getInventory had to be changed to ICorporeaSpark.getSparkInventory because the signature clashed (IInventory vs ItemStack[], respectively)
This can be changed to match vanilla signature, but either would break backward compat.
* SubTileEntity.getComparatorInputOverride parameter removed (it was actually incorrect also. Not side, but the meta of the block).
Anyways, vanilla removed it from their method so we follow suit.
* SubTileEntity's methods that are copied from block (onBlockadded, etc.) updated to match vanilla counterparts
* 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
* Removed icon methods from SubTileSignature
-- Other --
* 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.
* Some really needed fields in EntityItem are private now. Reflection time :(
* Alfglass now just uses the vanilla random model selection system to choose a pattern. Some of your builds may look different.
Unless someone figures out a way to use the old one
* The alt textures will probably be a resource pack now to decrease complexity...
sorry :/ The systems needed to dynamically switch out the textures like that is not worth just throwing them into a resource pack
* Slabs are kinda janky if you look at them - Mojang made some extremely silly assumptions and we're going to have to go with them
* Quartz stair textures may be assigned incorrectly - resource pack authors check me
* 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]
+15
View File
@@ -1,3 +1,18 @@
1.8 PORT README:
This is williewillus' 1.8(.8) port of Botania!
All licensing and distribution rights are exactly as 1.7.10 Botania
Use at your own risk as bugs may pop up unexpectedly.
I will EXACTLY match Vazkii/upstream design wise so NEVER ask me for balance or design changes. No.
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 1885 files, more files were not shown because too many files have changed in this diff. Show more