Compare commits

...
990 Commits
Author SHA1 Message Date
Vincent Lee 659ab9cf5c Fix item sideonly derps 2016-08-28 08:34:33 -05:00
Vincent Lee c077d4d464 Remove category from sounds.json as it is no longer used by vanilla 2016-08-27 19:46:50 -05:00
Vincent Lee 2aa05a4b07 Clean up libobf more 2016-08-27 19:34:08 -05:00
Vincent Lee d57354de2f Remove unnecessary new String[] libobfuscation 2016-08-27 19:12:04 -05:00
Vincent Lee 392a02e945 Modernize GoG skybox code. Fixes #460 2016-08-27 19:08:43 -05:00
Vincent Lee 0642754886 Build 319 2016-08-27 12:57:21 -05:00
Vincent Lee 2d225337af Stop spawning particles serverside 2016-08-27 12:53:33 -05:00
Vincent Lee 9f66216832 Item sideonly checks 2016-08-26 20:14:42 -05:00
Vincent Lee ed1cbbe9dd Merge pull request #455 from LGcommisar/master
Added textures for shields, see Issue #453.
2016-08-24 21:28:21 -05:00
Vincent Lee 6db2aa7dee Merge branch 'master' of github.com:williewillus/Botania 2016-08-24 21:27:50 -05:00
Vincent Lee 4ce5b40ebb Build 318 metadata 2016-08-24 21:27:44 -05:00
Vincent Lee c969ea3f72 Merge pull request #456 from pau101/master
Add floral powder to ore dictionary for wildcard dye
2016-08-24 21:27:06 -05:00
Vincent Lee 90085c4379 Fix comodification derpage 2016-08-24 21:22:25 -05:00
Vincent Lee 14851e751d Build 317 2016-08-24 21:19:24 -05:00
pau101 c3da70b52e Add floral powder to ore dictionary for wildcard dye 2016-08-23 21:02:25 -07:00
LGcommisar 29868d7d8e Delete keep 2016-08-23 23:42:59 -04:00
LGcommisar 656c0de2a3 Shield textures 2016-08-23 23:42:09 -04:00
LGcommisar b777e5856e Create keep 2016-08-23 23:41:42 -04:00
Vincent Lee f3dea919a6 Fix banner textures not being reversed properly 2016-08-23 17:02:29 -05:00
Vincent Lee af9588ff11 Pylons use new hidden model system instead of OBJState 2016-08-23 12:11:09 -05:00
Vincent Lee 8d52bb686f Merge branch 'master' of github.com:williewillus/Botania 2016-08-23 11:21:48 -05:00
Vincent Lee d4d42208a2 Merge pull request #454 from Luxor5393/master
Update crafty crate entry picture.
2016-08-23 11:12:59 -05:00
Vincent Lee fb34e7e848 Shorten config name 2016-08-23 11:09:54 -05:00
Luxor5393 53a582e188 Update crafty crate picture 2016-08-23 15:53:16 +02:00
Vincent Lee bffa5a1171 Remove redundant code and fix pixies being slow 2016-08-22 15:10:41 -05:00
Vincent Lee a47619879a Fix pixies instantly despawning clientside 2016-08-22 14:42:26 -05:00
Vincent Lee 6545845850 Reduce watch task range 2016-08-22 14:13:38 -05:00
Vincent Lee 8809524d6d Imports 2016-08-22 13:13:14 -05:00
Vincent Lee a9062856d1 Extend entityliving instead of entitycreature 2016-08-22 13:12:40 -05:00
Vincent Lee ddcff076a7 Cleanup and pull unneeded stuff out of datawatcher 2016-08-20 16:44:27 -05:00
Vincent Lee 9e56e04e6c Remove potions more cleanly 2016-08-20 16:32:37 -05:00
Vincent Lee b91ab69cea Remove unneeded world arg from particle methods 2016-08-20 14:38:24 -05:00
Vincent Lee d12717c29f Get rid of silly common proxy pattern 2016-08-20 14:31:25 -05:00
Vincent Lee 808d80affa Add note to refresh rendering after toggling config option 2016-08-19 20:33:32 -05:00
Vincent Lee 6478eb907e Localize config option 2016-08-19 20:21:14 -05:00
Vincent Lee 334d910086 Merge branch 'master' of github.com:williewillus/Botania 2016-08-19 20:19:11 -05:00
Vincent Lee 1b97974d0e Add config to render floating flowers in static renderer 2016-08-19 20:19:00 -05:00
Vincent Lee 2fe7d5e025 Slightly more efficient quad gathering 2016-08-19 19:57:51 -05:00
Vincent Lee 360a398fca Delete old model 2016-08-19 19:54:41 -05:00
Vincent Lee a9171cd215 Merge branch 'improvedfloaters' 2016-08-19 19:53:47 -05:00
Vincent Lee 815cdc9f52 Fix all textures 2016-08-19 16:09:18 -05:00
Vincent Lee 0a235cf5e8 Finish UV remapping 2016-08-19 15:12:52 -05:00
Vincent Lee 25a4877e1a Halved the texture size 2016-08-19 12:52:22 -05:00
Vincent Lee 28febcac08 UV map the bottom of the model. Add placeholders for sides 2016-08-19 12:42:30 -05:00
Vincent Lee 757abbe6d7 Merge pull request #448 from 3TUSK/zhCN
Update zh_CN.lang
2016-08-16 20:57:36 -05:00
3TUSK 28aa8bc0d5 Update zh_CN.lang
Signed-off-by: 3TUSK <urey.s.knowledge@gmail.com>
2016-08-16 21:20:42 -04:00
Vincent Lee 5392f00ff9 Fix orechid running clientside, closes #447 2016-08-16 18:09:06 -05:00
Vincent Lee 64712d315f WIP 2016-08-15 17:14:40 -05:00
Vincent Lee 789832bdc1 Merge branch 'master' into improvedfloaters 2016-08-15 15:55:50 -05:00
Vincent Lee a0a7428116 Bergamute now blocks moving/ticking sounds. Closes #407 2016-08-15 15:52:51 -05:00
Vincent Lee 37eb1a781c Fix bergamute having a nonmatching color 2016-08-15 15:34:06 -05:00
Vincent Lee a0a78ea203 Build 316 2016-08-15 13:43:18 -05:00
Vincent Lee ba3f337520 Remove moss stone botaina recipe, remove old tooltips 2016-08-15 12:11:51 -05:00
Vincent Lee 9e13eda148 Add missing sideonly to blocks 2016-08-15 12:00:51 -05:00
Vincent Lee 4f26ea9893 Use vanilla mechanisms to sync TE's instead of rolling own 2016-08-14 11:46:45 -05:00
Vincent Lee 878c0dbeba Make ender hand less desyncy and clean some old filesy 2016-08-14 10:46:10 -05:00
Vincent Lee 687d475aeb Corporea no longer runs clientside 2016-08-13 15:21:32 -05:00
Vincent Lee 1eafb2e85e Update forge, fix tooltips additions not matching item tooltip. Closes #219 2016-08-13 14:26:10 -05:00
Vincent Lee 2877d304ce Mana blaster now shows active lens on model 2016-08-13 12:50:17 -05:00
Vincent Lee dc1eab4dd8 Fix weird model name clash. Closes #436 2016-08-12 22:17:12 -05:00
Vincent Lee f71b4b6cf2 Fix all other potatoes. Closes #409 2016-08-12 21:41:27 -05:00
Vincent Lee 2b3cfd985c Don't spam quite so many stacks 2016-08-11 21:00:04 -05:00
Vincent Lee 2a4b489eca Bunch more potato fixes, and one for me! 2016-08-11 20:38:54 -05:00
Vincent Lee 348b52eb9f Fix some of the easier potatoes 2016-08-11 19:50:01 -05:00
Vincent Lee 12be321b73 Merge pull request #433 from yrsegal/potatoes
Do initial work on potatoes
2016-08-11 18:27:12 -05:00
Vincent Lee 07f68b37da Fix missing sideonly 2016-08-09 21:04:09 -05:00
Vincent Lee 8d9996cb6b Fix corporea retainer comparator output not working. Closes #430 2016-08-09 19:57:41 -05:00
Vincent Lee 32a28e83a5 Magic flowers now show properly in JEI. Closes #431 2016-08-09 19:48:54 -05:00
Vincent Lee 0b34fe7193 Fix porting derp in flare lens. Closes #429 2016-08-08 20:17:22 -05:00
Vincent Lee a3e8d88f1c Fix a corproea animation being absent 2016-08-07 20:10:44 -05:00
Vincent Lee 8423607b29 Reinstate null subtile check. Closes #428 2016-08-07 18:30:31 -05:00
Vincent Lee 90c42b25c7 Get rid of some triple nested for loops 2016-08-07 12:27:01 -05:00
Vincent Lee ddda9db4ac Make bubbell less laggy 2016-08-07 12:00:52 -05:00
Vincent Lee 16615ce429 Tweak cacophonium interactions 2016-08-06 12:04:18 -05:00
Vincent Lee aeaa2a76c4 Tweak black hole talisman interactions, fix a crash 2016-08-06 11:48:01 -05:00
Vincent Lee 921825aca3 Fix pickup delay not getting set properly in thrown items 2016-08-05 20:59:05 -05:00
Vincent Lee c3e4a02825 A few inconsequential cleanups 2016-08-05 20:51:21 -05:00
Vincent Lee 3d7c9e8b94 Update forge, remove some unneeded particle methods 2016-08-05 20:21:50 -05:00
Vincent Lee a0aac5a9bf Stupid compile derp 2016-08-05 18:36:04 -05:00
Vincent Lee acd5cce7ce Fix a bunch of things assuming the player only has main hand. Closes #424 2016-08-05 18:31:44 -05:00
Vincent Lee 8eccfad65e If we can't see the extended state bail. This is not a big deal. CLose #423 2016-08-04 19:54:16 -05:00
Vincent Lee 59771083d2 Merge branch 'master' of github.com:williewillus/Botania 2016-08-03 20:31:05 -05:00
Vincent Lee 3a5e78a4c6 Build 315 2016-08-03 20:30:33 -05:00
Vincent Lee b648c36111 Merge pull request #420 from shadowfacts/master
Allow Elven Trade recipes to have multiple outputs
2016-08-02 18:49:16 -05:00
Shadowfacts 5e8eaf8c77 Fix Elven Trade JEI handling for trades with multiple outputs 2016-08-02 16:34:59 -04:00
Shadowfacts 6cde8299c4 Modify Elven Trade recipes to allow for recipes with multiple outputs 2016-08-02 16:23:40 -04:00
Vincent Lee 947a225d23 TIL you don't set default values for unlisted properties 2016-07-31 20:55:04 -05:00
Vincent Lee 67ef25de09 Prep for debug helper build 2016-07-31 20:07:49 -05:00
Vincent Lee 4656680250 New optimized floating island model 2016-07-31 17:05:51 -05:00
Vincent Lee 072e3a693b Fix extended state blocks shitting themselves 2016-07-31 15:05:27 -05:00
Vincent Lee b29c810a80 Use face quads in floating models. Partially alleviates #414 2016-07-31 12:55:53 -05:00
Vincent Lee 3f8e3f72d9 Version checker just piggybacks off forge one now 2016-07-30 16:37:50 -05:00
Vincent Lee 5041e23ede Cleanup, black hole talisman uses caps, debug handler shows extended state 2016-07-30 16:24:42 -05:00
Vincent Lee 21a35c9c92 1.8 recipes now permanently on, fix initial loop recipe being oredicted. Closes #413 2016-07-30 14:38:46 -05:00
Vincent Lee 6d542dec5a Clean up methodhandles 2016-07-30 14:06:07 -05:00
Vincent Lee 4552a451ae Fix lexicon 3d model 2016-07-30 14:02:25 -05:00
Vincent Lee 5c33e95a54 Remove unused overload 2016-07-30 12:12:33 -05:00
Vincent Lee 1e2bd1d4cd Blocks now own their itemblock model registration 2016-07-30 12:11:28 -05:00
Vincent Lee 1cc995c986 Split black lotus metas 2016-07-30 10:56:14 -05:00
Vincent Lee 1799380064 Blocks own their statemappers 2016-07-30 10:52:48 -05:00
Vincent Lee 0d3ffa2598 Final model splitting, on to code cleanup 2016-07-30 10:38:57 -05:00
yrsegal f8abe9d7b1 initial work on potatoes 2016-07-30 00:07:20 -04:00
Vincent Lee 3dc65c80d8 More model cleanup, and add a readme for artists 2016-07-29 20:55:59 -05:00
Vincent Lee bc0da61058 Build 314 2016-07-29 18:41:07 -05:00
Vincent Lee c9e1647070 Fix crash 2016-07-29 18:24:16 -05:00
Vincent Lee d622f0cd58 Move block registration out of constructors 2016-07-29 18:04:17 -05:00
Vincent Lee 32a505a575 More model reorganization 2016-07-27 22:04:23 -05:00
Vincent Lee 7ce589c6db Made treasure enchants more expensive to apply, remove some log spam 2016-07-27 19:02:31 -05:00
Vincent Lee f0aa44999f Some biomestone jsons 2016-07-27 18:59:27 -05:00
Vincent Lee 88f99a636c Merge branch 'master' of github.com:williewillus/Botania 2016-07-26 20:31:08 -05:00
Vincent Lee 568139fd17 Merge pull request #406 from Flaxbeard/master
Added ManaDiscountEvent
2016-07-26 20:30:49 -05:00
Flaxbeard cf0189c3ee Added ManaDiscountEvent 2016-07-25 16:07:35 -05:00
Vincent Lee 2ee0d7f0ed More borign model cleaning 2016-07-24 21:36:49 -05:00
Vincent Lee 6997a96460 Slabs/walls/stairs own their own model registration 2016-07-24 15:45:43 -05:00
Vincent Lee 179ca23f6c Items now 'own' their own model registration! 2016-07-24 15:09:05 -05:00
Vincent Lee e7e5b1b484 Migrate other meshers 2016-07-24 14:01:14 -05:00
Vincent Lee fbd9917fd4 FOld more methods in 2016-07-24 13:18:46 -05:00
Vincent Lee 881e271a0b Lambdafy everything as they now work 2016-07-24 10:36:58 -05:00
Vincent Lee 3b5c500bc9 Clean up meshers 2016-07-24 10:12:12 -05:00
Vincent Lee 4751da9e7b Panes 2016-07-23 21:18:48 -05:00
Vincent Lee 1c4ae58377 Clean up the pools 2016-07-23 21:08:01 -05:00
Vincent Lee 9f0c710479 More 2016-07-23 20:51:45 -05:00
Vincent Lee 8a13a03016 Optimize number of slab models 2016-07-23 19:41:19 -05:00
Vincent Lee 7ef27df0bc Cleanup the cleanup 2016-07-23 19:29:36 -05:00
Vincent Lee 01a913c96c More model cleanup 2016-07-23 17:49:00 -05:00
Vincent Lee 110396f39e More model cleanup 2016-07-23 17:29:22 -05:00
Vincent Lee 233bc705b0 More model cleanup 2016-07-23 16:39:05 -05:00
Vincent Lee 6264ebddbc Move itemblock jsons to their own subfolder 2016-07-23 16:04:03 -05:00
Vincent Lee bedbf55b33 Separate out biome wall models. Don't worry it'll get organized. Closes #401 2016-07-23 15:58:03 -05:00
Vincent Lee a5d688883e Fix some walls being flipped, separate the models out 2016-07-23 15:31:18 -05:00
Vincent Lee 83d0b8dc12 Remvoe the nag (you're welcome) 2016-07-23 15:09:20 -05:00
Vincent Lee c05c1ef8bf Clean out lang files 2016-07-23 15:08:26 -05:00
Vincent Lee c5d5e59b96 Byebye Future (hah) stones! 2016-07-23 14:50:03 -05:00
Vincent Lee 1fd48994d7 Byebye ender stuff! 2016-07-23 14:17:27 -05:00
Vincent Lee cf56634a91 Byebye thatch and reeds! 2016-07-23 14:04:49 -05:00
Vincent Lee 1344bb8c08 Exorcism begins: remove (almost) all prismarine 2016-07-23 13:51:19 -05:00
Vincent Lee 2bf69eaa56 Useless constant change 2016-07-23 13:32:31 -05:00
Vincent Lee b242d43861 Update forge 2016-07-23 10:48:57 -05:00
Vincent Lee 404c39c8f8 Fix slingshot not firing properly, fixes #402 2016-07-22 18:33:36 -05:00
Vincent Lee d8bdb6a31d Fix cacophonium. Closes #400 2016-07-21 19:02:23 -05:00
Vincent Lee c5208175d7 Made a bunch of evthandlers static 2016-07-20 21:22:33 -05:00
Vincent Lee a0d0fefe8d Move to 1.10 2016-07-20 20:55:20 -05:00
Vincent Lee 87172ea3f2 Build 314 2016-07-20 20:29:16 -05:00
Vincent Lee 16381383cb Fix wills not applying. Closes #372 2016-07-20 20:18:16 -05:00
Vincent Lee 252e3191dc Fix some particles being missing 2016-07-17 21:16:50 -05:00
Vincent Lee ce0ba85397 Made it more reliable 2016-07-17 20:58:30 -05:00
Vincent Lee aa8dc5d16c Fix something in bows not being cross proxied. Closes #398 2016-07-17 20:33:56 -05:00
Vincent Lee dff2cf2bf1 Change flavour text 2016-07-16 17:40:10 -05:00
Vincent Lee 347c100e93 Add the version txt for 1.10.2 that never got added .-. 2016-07-16 17:35:56 -05:00
Vincent Lee 003fb22733 Tidy up, add texture 2016-07-16 17:34:57 -05:00
Vincent Lee 7f5d3859e4 Added the Bergamute 2016-07-16 16:52:59 -05:00
Vincent Lee 124fdeeee3 Possible fix for #343 2016-07-13 21:44:10 -05:00
Vincent Lee 611f33a133 Fix #395 2016-07-13 21:13:36 -05:00
Vincent Lee a76efcc6fc Actually fix #386 2016-07-06 21:46:39 -05:00
Vincent Lee cd3daf2b47 Fix rod of bifrost going batshit. Closes #386 2016-07-04 13:17:57 -05:00
Vincent Lee dc05115497 Merge pull request #370 from howtonotwin/chordata
Rewrite some of the Ring of Chordata
2016-07-04 12:55:41 -05:00
Vincent Lee 44a4657cd8 Fix crafting halo crash and cleanup inventory utils, closes #385 2016-07-04 12:09:52 -05:00
Vincent Lee 8e70e9fa68 FIx starcaller not working, blacklist aura nodes from rod of shaded mesa. Closes #387: 2016-06-30 21:24:40 -05:00
Vincent Lee 0b635c5bc7 Fix missed change in gradle 2016-06-29 20:28:36 -05:00
Vincent Lee 6f69d5d154 Build 312 2016-06-29 20:28:09 -05:00
Vincent Lee 589b4e49b6 Prep buildscripts for 1.10.2 2016-06-29 20:24:25 -05:00
Vincent Lee b30ad911fa Reflect since trying to get around inlining isn't working 2016-06-29 20:22:14 -05:00
Vincent Lee be667b2ee3 Fix some items not being held right 2016-06-29 19:30:06 -05:00
Vincent Lee bea1c6ecdc Fix cross proxy detection to support 1.10.2 2016-06-29 19:29:54 -05:00
Vincent Lee 971b1ee3e2 Fix typo in king key, closes #381 2016-06-28 21:19:18 -05:00
Vincent Lee 4172637bcc Fix drum sound 2016-06-26 17:18:10 -05:00
Vincent Lee 2650813f95 Fix burst range being much smaller than it should be. Closes #376 2016-06-26 16:19:40 -05:00
Vincent Lee 1fbcb0b39b Fix desyncing in runic altar, closes #374 2016-06-26 11:29:47 -05:00
Vincent Lee e28f82dc7d Apothecary right click uses caps 2016-06-26 11:07:46 -05:00
Vincent Lee d3d94e46d7 Special flower item models fall back to poppy. Close #375 2016-06-26 09:05:35 -05:00
Vincent Lee b2d7bc2794 Pick block for entities 2016-06-25 16:09:46 -05:00
Vincent Lee 2afaac9f20 Fix flowers emitting light. Closes #369 2016-06-25 15:27:34 -05:00
Vincent Lee 28b3e5d22b Build 311 2016-06-25 15:10:02 -05:00
Vincent Lee da3958a414 Fix more build stuff 2016-06-25 14:59:39 -05:00
Vincent Lee 4ddf3767c5 Update buildscript for 1.10 2016-06-25 14:50:07 -05:00
Vincent Lee 81c45fb079 Fix ring of far reach and fix proxy selection 2016-06-25 14:43:24 -05:00
Vincent Lee 49d79abb83 Include 1.10 in accepted mc versions 2016-06-24 19:59:24 -05:00
Vincent Lee 1a3b6833b5 Update JEI 2016-06-24 19:58:57 -05:00
Vincent Lee 38cd0fbf55 Switch pain spots to using crossproxy 2016-06-24 19:43:31 -05:00
Vincent Lee 9d1e7f86cf Futureproof update json url 2016-06-24 19:35:24 -05:00
Vincent Lee 5863b165ad Added cross version proxies 2016-06-24 19:33:58 -05:00
Vincent Lee f7a1f629be JEI hack for 1.10 2016-06-24 18:59:23 -05:00
Vincent Lee 6f348e7db1 Made dispenser behaviours 1.10 safe 2016-06-24 18:55:41 -05:00
Howtonotwin b6ddefcaf4 Rewrite some of the Ring of Chordata
Add guard against having two rings equipped; the second ring will be
inactive. Fixes #340
2016-06-24 17:11:55 -04:00
Vincent Lee c6df7c260a Fix lexicon word count 2016-06-22 19:29:06 -05:00
Vincent Lee 9a11ebef1f Fix 1.8 stones not being voided, clean up ore dict registrations that are no longer needed 2016-06-22 19:16:52 -05:00
Vincent Lee 1bb254a4fc Workaround subtiles crashing when dug 2016-06-22 19:04:19 -05:00
Vincent Lee 8600b75691 Fix solegnolia not working on dediserver and threadsafe the collection. Fixes #346 2016-06-22 18:41:21 -05:00
Vincent Lee 337851994f Fix bad portuguese brick recipes. Closes #368 2016-06-21 19:44:14 -05:00
Vincent Lee b232d8bb93 Fix #367 2016-06-21 19:31:24 -05:00
Vincent Lee 2a2971f75a Merge branch 'MC19' of github.com:williewillus/Botania into MC19 2016-06-21 19:26:56 -05:00
Vincent Lee dced32bf4c Merge pull request #365 from Luxor5393/patch-1
Fix two typos.
2016-06-21 19:23:58 -05:00
Luxor5393 420d4b0aa4 Fix two typos. 2016-06-21 16:57:47 +02:00
Vincent Lee d4b0d0aec9 Cleanup 2016-06-20 19:54:33 -05:00
Vincent Lee e37b3ac3e6 Soulscribe only effective when fully charged 2016-06-20 19:34:08 -05:00
Vincent Lee 6a4f8e9f4b Switch some things to tessellator 2016-06-19 10:37:32 -05:00
Vincent Lee d7929eed08 Fix terra pick darkening screen 2016-06-19 10:21:37 -05:00
Vincent Lee 028f0c4c82 Minor opt to red string interceptor 2016-06-19 10:05:10 -05:00
Vincent Lee 71edb3abb1 Fix transforms on runic altar. Closes #351 2016-06-19 09:47:58 -05:00
Vincent Lee 4fede6f49e Cleanup 2016-06-18 23:12:37 -05:00
Vincent Lee 4ef18f3347 Fully serverside enchanter 2016-06-18 23:09:27 -05:00
Vincent Lee eaa9c89684 Optimize spectator net traffic more - don't use nbt list of nbt longs just use nbt int array 2016-06-18 21:42:53 -05:00
Vincent Lee 37c2adece1 Fix spark particles not spreading out 2016-06-18 21:28:19 -05:00
Vincent Lee 9f94407be0 Fix armor format error 2016-06-18 21:09:08 -05:00
Vincent Lee 7b6d2e843e JK it's 2 overrides 2016-06-18 19:10:27 -05:00
Vincent Lee 7d87732ccb Actually prevent shoving. Why the heck does it require three overrides?? 2016-06-18 19:04:54 -05:00
Vincent Lee 3c9388702c Prevent GG from being shoved while it's still spawning 2016-06-18 18:42:27 -05:00
Vincent Lee e338735814 Allow non-melle player damage to GG (arrows) damage cap still applies. Damage reduction in hard mode now done using armor 2016-06-18 18:36:15 -05:00
Vincent Lee d34fc5a3e1 GG now deals damage if a player is in its path of teleport 2016-06-18 18:03:21 -05:00
Vincent Lee d9522fcc18 Fix gaia removed potion effects not syncing, made magic landmines deal magic (armor bypassing) damage 2016-06-18 17:25:51 -05:00
Vincent Lee 53147606c1 GG automatically distributes drops to appropriate players. Also fix mobs getting too short of a fire resist 2016-06-18 16:48:58 -05:00
Vincent Lee cfb368f67e Immutabilize vector3 as it being defensively copied all over already 2016-06-18 16:11:03 -05:00
Vincent Lee 6c307d16f4 Made Quats proper value type 2016-06-18 15:28:54 -05:00
Vincent Lee 3a8fc10cc9 Fix TE resyncs sending a bit too much stuff 2016-06-18 14:57:13 -05:00
Vincent Lee f2544a6fa4 Remove debug logging in special flower model 2016-06-18 14:37:07 -05:00
Vincent Lee b7e77936b3 Remove guards in TileMod since forge has them now 2016-06-18 14:36:36 -05:00
Vincent Lee 8767180a7b Made special flower models use a guava cache. Fixes threading issues, closes #338 2016-06-18 14:21:56 -05:00
Vincent Lee bc52c67c89 Fix tiara conflicting with spectator mode, closes #356 2016-06-18 12:42:18 -05:00
Vincent Lee 0001f9c8f1 Save flare chakram state in NBT, closes upstream issue 1620 2016-06-17 19:43:45 -05:00
Vincent Lee 9fef518968 Fix broken hsb calculation because mojang's function is broken. Also fix upstream issue 1672 2016-06-17 19:41:59 -05:00
Vincent Lee 6b10ada28a Build 310 I need sleep 2016-06-17 00:21:01 -05:00
Vincent Lee f3a3e80334 Revert "Revert "Fix other mods crashing because of alternate implementations of metadata""
This reverts commit fc23dedd05.
2016-06-17 00:17:51 -05:00
Vincent Lee 5cdd2ee32f Revert "Cleaner solution"
This reverts commit a9cc76576a.
2016-06-17 00:17:48 -05:00
Vincent Lee a9cc76576a Cleaner solution 2016-06-17 00:03:35 -05:00
Vincent Lee fc23dedd05 Revert "Fix other mods crashing because of alternate implementations of metadata"
This reverts commit 25cd574662.
2016-06-17 00:03:04 -05:00
Vincent Lee 65bf209835 Merge branch 'MC19' of github.com:williewillus/Botania into MC19 2016-06-16 23:46:35 -05:00
Vincent Lee d2e84babb7 Fix flowers popping off on relay and mycelium 2016-06-16 23:44:44 -05:00
Vincent Lee 850ea37f4d Merge pull request #354 from yrsegal/patch-1
Fix other mods crashing because of alternate implementations of metadata
2016-06-16 23:32:23 -05:00
Vincent Lee 2d0af453b3 Tweak various model transforms. Closes #350: 2016-06-16 23:30:23 -05:00
Vincent Lee d5c9c7815e Clean up lightning code 2016-06-16 23:12:22 -05:00
Wire Segal 25cd574662 Fix other mods crashing because of alternate implementations of metadata
Closes #352
Closes #353
2016-06-16 23:57:43 -04:00
Vincent Lee 3cf1619b2e Build 309 2016-06-16 21:22:51 -05:00
Vincent Lee 73c06c10eb Fix server crash 2016-06-16 21:18:35 -05:00
Vincent Lee 1d5dfa149e TIL Collection.removeIf 2016-06-16 21:04:36 -05:00
Vincent Lee c1fff324d1 Remove extraneous debug print 2016-06-16 20:59:52 -05:00
Vincent Lee 95f1e768fe Update forge, fix mana blaster overrides 2016-06-16 20:40:11 -05:00
Vincent Lee ec9496b0e7 Remove some unused stuff 2016-06-16 19:48:14 -05:00
Vincent Lee 5f3951c7fa Fix solegnolia having lower range than advertised. Closes #346 2016-06-16 19:39:26 -05:00
Vincent Lee 47ac6fc65a Check for blocks with no item in overgrowth seed. Closes #347 2016-06-16 19:26:29 -05:00
Vincent Lee ae0894a8d0 Fix keybinding crash. Closes #344 2016-06-16 19:24:12 -05:00
Vincent Lee 96bf87333b Clean up lightning code, batch the render by 200's to not overflow the tess. Closes #342 2016-06-14 20:30:52 -05:00
Vincent Lee 9e09a3f42d Update forge and fix pylon transforms, closes #252 2016-06-12 13:19:31 -05:00
Vincent Lee bc0ca77960 Terra blade now respects 1.9 cooldown 2016-06-11 21:11:47 -05:00
Vincent Lee 8bca8bb5f6 Get rid of some of the many stupid parXX parameter names 2016-06-11 14:42:18 -05:00
Vincent Lee ece95aca1c Big parameter name cleanup, part 1 2016-06-11 14:28:22 -05:00
Vincent Lee c357ab68c3 Super minor optimization for object alloc 2016-06-11 13:58:05 -05:00
Vincent Lee cfc1ba8baf Gaia head can now be worn. Closes #305 2016-06-11 12:57:46 -05:00
Vincent Lee f56eca23fc Fix #330 2016-06-11 11:24:00 -05:00
Vincent Lee b7aab995db Merge pull request #337 from yrsegal/MC19
Fix all outstanding auxiliary renders.
2016-06-10 22:48:18 -05:00
yrsegal ec5fcef90c fix devil tail 2016-06-10 23:22:41 -04:00
yrsegal f4d7a80e49 Fix all cosmetic baubles and use NONE 2016-06-10 22:49:53 -04:00
Vincent Lee c289edd825 Serverside normal sparks 2016-06-10 20:31:34 -05:00
Vincent Lee 5ac09b830d Some net stuff for later 2016-06-10 19:52:05 -05:00
Vincent Lee 709fc130d5 Merge branch 'MC19' of github.com:williewillus/Botania into MC19 2016-06-10 19:31:29 -05:00
Vincent Lee 873aedf4e5 Fix #332 2016-06-10 19:31:11 -05:00
Vincent Lee 27410530d6 Tweak horn sidings 2016-06-10 19:18:28 -05:00
yrsegal 491452ac7b Fix all outstanding auxiliary renders.
close #49 until the next time renders break
2016-06-10 16:56:39 -04:00
Vincent Lee 4e905ede36 Merge pull request #336 from isambourgg/patch-1
Update fr_FR.lang
2016-06-10 14:46:44 -05:00
Vincent Lee 6afc33c57b Merge branch 'MC19' of github.com:williewillus/Botania into MC19 2016-06-09 20:50:15 -05:00
Vincent Lee 5f35b8aef0 Readd old overrides, not working because of forge bug 2016-06-09 20:49:49 -05:00
isambourgg 699ee5027a Update fr_FR.lang
Relecture et correction jusqu'à la Ligne 559.
2016-06-09 16:42:34 -04:00
Vincent Lee 7c32f5fbaf Merge pull request #331 from yrsegal/patch
Fix sneaking transforms being out of place for baubles
2016-06-08 18:08:35 -05:00
yrsegal 3c0fe199d5 Fix sneaking transforms being out of place for baubles 2016-06-08 17:02:41 -04:00
Vincent Lee c15f08b066 Remove unofficial port message from login nag 2016-06-07 20:18:05 -05:00
Vincent Lee c47de38ec9 Fix inventory transforms for floating flowers 2016-06-05 18:14:07 -05:00
Vincent Lee 9b3c1d721d Minor potion cleanup 2016-06-05 17:45:58 -05:00
Vincent Lee 5d19a0dd6c Workaround for armorstand helmets. Closes #23 2016-06-05 16:37:52 -05:00
Vincent Lee 89834b4053 Clean up some other models 2016-06-05 15:15:45 -05:00
Vincent Lee 85eef6c461 Steal the transforms from Psi :P 2016-06-05 15:11:17 -05:00
Vincent Lee 9897d3ed80 Merge branch 'newblaster' into MC19 2016-06-05 14:57:44 -05:00
Vincent Lee 02cfe14d94 Move bauble box to caps as well. Closes #297 2016-06-05 14:32:08 -05:00
Vincent Lee 4b4b9a308c Tweaks to previous commit 2016-06-04 23:14:33 -05:00
Vincent Lee 55df4f0619 Move flower pouch to caps 2016-06-04 22:59:53 -05:00
Vincent Lee c83578b920 Clean up basic section lexicon and some misc lang entries 2016-06-04 21:35:43 -05:00
Vincent Lee 39517588e7 Clean up some todos 2016-06-04 20:10:13 -05:00
Vincent Lee 14f0c43850 Fix armor material registration, buff terrasteel armor slightly 2016-06-04 20:00:10 -05:00
Vincent Lee 05c6a07bc2 Clean up logging and log spam. #cleanloginitiative 2016-06-04 19:01:34 -05:00
Vincent Lee d241f95bee Zap some duplicated code 2016-06-04 12:06:39 -05:00
Vincent Lee 49a6f00b41 Update Forge, some fluid cap stuff 2016-06-03 23:10:33 -05:00
Vincent Lee 14b2a35862 Clean up English present in es_ES, fr_FR. My pinkie hurts. 2016-06-03 20:41:32 -05:00
Vincent Lee 4aeed07f75 Clean up English present in nl_NL, pt_BR 2016-06-03 20:27:21 -05:00
Vincent Lee cdcfe75325 Clean up English present in es_AR, ru_RU 2016-06-03 20:20:51 -05:00
Vincent Lee 303e89f6c5 Clean up English present in ja_JP and ko_KR 2016-06-03 20:11:55 -05:00
Vincent Lee c9e501fd02 Clean up English present in zh_CN, zh_TW 2016-06-03 20:03:19 -05:00
Vincent Lee 3049ac9767 Clean up English present in de_DE 2016-06-03 19:52:54 -05:00
Vincent Lee 11c0e4b274 Add warning header to all lang files 2016-06-03 19:41:54 -05:00
Vincent Lee fab5fc0087 Remove ColoredLights integration 2016-06-03 19:28:15 -05:00
Vincent Lee a5df917d5a Update BM mod id 2016-06-03 18:56:06 -05:00
Vincent Lee c2931d1517 Merge branch 'MC19' of github.com:williewillus/Botania into MC19 2016-06-02 21:41:10 -05:00
Vincent Lee b71cb163a7 Fix fallback for contributors with flowers not in main botania. Closes #321 2016-06-02 21:40:36 -05:00
Vincent Lee ff69a2e458 Merge pull request #320 from yrsegal/MC19
Make the lexicon recipe mappings accept the wildcard value
2016-06-01 21:20:35 -05:00
Vincent Lee 4cfd420cc1 Let some technical blocks drop normal drop from weight lens 2016-06-01 21:09:33 -05:00
Vincent Lee 95bd4689d6 Fix halo crashing, also tweak visuals slightly. Closes #314 2016-06-01 20:39:49 -05:00
Vincent Lee d2aa4e0ebc Fix some missing glstatemanager substitutions. Fixes #307 2016-06-01 20:19:40 -05:00
yrsegal 1bff638075 Make the lexicon recipe mappings accept the wildcard value 2016-06-01 18:39:36 -04:00
Vincent Lee 78f296d0cf Merge branch 'MC19' of github.com:williewillus/Botania into MC19 2016-05-31 20:58:30 -05:00
Vincent Lee 6014df2b12 Fix a couple baubles 2016-05-31 20:57:45 -05:00
Vincent Lee 30c208aa55 Merge pull request #315 from howtonotwin/258-bhtalisman
Limit BH Talisman to world height. Fixes #258
2016-05-31 20:35:52 -05:00
Vincent Lee 96a2da61f5 Fix wrong import 2016-05-31 20:03:39 -05:00
Howtonotwin fd35d25423 Limit BH Talisman to world height. Fixes #258 2016-05-31 17:17:20 -04:00
Vincent Lee 2065f01b8d Fix pool crafting particles 2016-05-30 21:37:56 -05:00
Vincent Lee 6c52c4f5f9 Fix chakrams being weird. Closes #306 2016-05-30 17:14:06 -05:00
Vincent Lee 307068c9c4 Lower spawn fuzz to 0 in gog, fixes #287 2016-05-30 16:21:56 -05:00
Vincent Lee 688da731ab Spell cloth can no longer be enchanted at an anvil, closes #308 2016-05-30 12:57:21 -05:00
Vincent Lee ac003f1307 Gaia guardian now looks like whoever is viewing it. spooky. 2016-05-28 16:45:57 -05:00
Vincent Lee 3e0f5da01d Clean up gaia head renderer. Closes #303 2016-05-28 15:44:20 -05:00
Vincent Lee cc1b66f3cd Gradle script automatically updates update.json 2016-05-28 12:50:41 -05:00
Vincent Lee c08fa024a0 Add update.json not done yet, bump forge minimum req version 2016-05-28 11:46:06 -05:00
Vincent Lee 4f0d63f5a0 Build 308 2016-05-28 11:09:08 -05:00
Vincent Lee 8ef557e51b Remove loot debug -.- 2016-05-28 11:04:40 -05:00
Vincent Lee 974e8d0316 Build 307 2016-05-27 20:55:48 -05:00
Vincent Lee cf82603f04 Update bow methods. Closes #300 2016-05-27 20:26:54 -05:00
Vincent Lee 1d54442e01 Fix axe digging closes #301 2016-05-27 19:56:07 -05:00
Vincent Lee a07f7914ae Add chest textures, update Forge 2016-05-27 19:51:59 -05:00
Vincent Lee 51c7d310a7 Moar clenaup 2016-05-26 23:22:50 -05:00
Vincent Lee e3e6f8996f Cleanup 2016-05-26 23:08:53 -05:00
Vincent Lee 7f759c1b88 Fix ender air bottle being underpowered 2016-05-24 21:16:18 -05:00
Vincent Lee 57e1fd5b41 Merge branch 'master' of https://github.com/Vazkii/Botania into MC19 2016-05-22 13:20:39 -05:00
Vincent Lee 8b88289789 Fix issues associated with last commit 2016-05-22 13:19:11 -05:00
Vincent Lee ff2afbf037 Untested: replace most uses of common i18n with client one 2016-05-22 11:41:33 -05:00
Vincent Lee 41b3e6cd4f Use all bits for effect packet args. Closes #296 2016-05-21 23:40:10 -05:00
Vincent Lee 930703b5c1 Workaround for 'global' particles at small render distances. Close #15 (mostly) 2016-05-21 23:38:17 -05:00
Vincent Lee f52dca111f Flower bag plays sound and animation. Closes #295 2016-05-21 22:55:30 -05:00
Vincent Lee 9694664922 Fix mana cookie lasting too short (thanks wiresegal) 2016-05-21 22:13:52 -05:00
Vincent Lee e2e00f7ef1 Use chunk util method that exists instead of own thing 2016-05-21 12:13:37 -05:00
Vincent Lee c9de3bcc03 Mana pools now try catalyst recipes first before recipes without catalyst specified. Also make mana bar not render in spectator. Closes #291 2016-05-20 14:36:28 -05:00
Vincent Lee 995c19c04a Fix TE syncing on login, 2 minor optimizations 2016-05-19 14:07:52 -05:00
Vincent Lee 96983a1d6b Merge branch 'MC19' of github.com:williewillus/Botania into MC19 2016-05-19 10:03:48 -05:00
Vincent Lee 8f00e9bdd6 Build 306 2016-05-19 10:03:24 -05:00
Vincent Lee 49d3004c60 Merge pull request #288 from yrsegal/MC19
Fix recipesorter complaining
2016-05-18 21:36:57 -05:00
Vincent Lee 8fb3b886a8 Get rid of all the nullable-nonnull stuff, warning huge diff 2016-05-18 21:03:12 -05:00
yrsegal 3c159e2485 Fix recipesorter complaining
Closes #269
2016-05-18 21:01:09 -04:00
Vincent Lee bdf51cbc8b Move IManaCollisionGhost to blocks. Closes #280 2016-05-18 19:16:51 -05:00
Vincent Lee 056f46b1f8 Update to 1.9.4 - untested waiting on baubles 2016-05-18 15:22:35 -05:00
Vincent Lee a59ee11da4 Build 305 2016-05-18 14:14:07 -05:00
Vincent Lee 9b06371a4e Fix dirt path and spreader binding. Closes #279 2016-05-18 11:31:12 -05:00
Vincent Lee afb3f6f44b Fix lexicon model i accidentally broke 2016-05-18 11:22:13 -05:00
Vincent Lee 1deb617f72 Fix GOG sound #285 2016-05-18 11:13:38 -05:00
Vincent Lee b1fad332b8 Fix terraaxe icon when inactive, closes #281 2016-05-15 21:51:24 -05:00
Vincent Lee df478b0ff8 Fix picking root block giving bad item. Closes #282 2016-05-15 21:25:54 -05:00
Vincent Lee 68560a335e Minor cleanup 2016-05-13 22:47:18 -05:00
Vincent Lee 13905a174c Fix smoke particles 2016-05-13 00:08:35 -05:00
Vincent Lee ef0f31f2de Some probably useless optimizations 2016-05-12 20:02:57 -05:00
Vincent Lee 1d7a402c6e Optimize itemfinder heavily 2016-05-12 19:45:51 -05:00
Vincent Lee b0fad5db16 Fix hopperhock being broken with vanilla chests 2016-05-12 17:51:58 -05:00
Vincent Lee 481eb5e711 Serverside many subtiles 2016-05-12 17:38:25 -05:00
Vincent Lee 1e26be3c77 Weaken boss collection 2016-05-12 16:30:01 -05:00
Vincent Lee a2d8aa17d2 Fix petal burying #274 2016-05-12 14:47:29 -05:00
Vincent Lee ebc6f1a8c6 Loonium now can be set to a custom loot table. For mapmakers 2016-05-11 19:27:15 -05:00
Vincent Lee 6a5e37b632 Update forge, fully fix loot generation 2016-05-11 11:50:06 -05:00
Vincent Lee 6b55f97a44 Build 304 2016-05-10 23:24:27 -05:00
Vincent Lee ae71a4756c I messed that up >.>. Fix server crash on startup #272 2016-05-10 23:21:38 -05:00
Vincent Lee bf0712a75c Build 302 2016-05-10 23:18:46 -05:00
Vincent Lee 79e2ee7c0a Shim in loot table to suppress errors in public build 2016-05-10 19:54:09 -05:00
Vincent Lee fb7fda6996 Update versionchecker links 2016-05-10 19:39:02 -05:00
Vincent Lee c944512519 Fix pump rendering, pool cart rendering. Made pool cart spawn particles 2016-05-10 19:11:18 -05:00
Vincent Lee dc8104f68b Preliminary work on new loot system 2016-05-10 11:55:50 -05:00
Vincent Lee 46417330a4 Fix #266 log spam 2016-05-07 22:32:09 -05:00
Vincent Lee 2f292ed3be Fix #271 incense rendering 2016-05-07 22:29:46 -05:00
Vincent Lee 4231dc839f Add reverse petal block recipes 2016-05-07 11:56:57 -05:00
Vincent Lee be1eb570ef More minor cleaning 2016-05-06 23:50:00 -05:00
Vincent Lee d524a0b2e9 Fold a couple interfaces together, we have way too many .-. 2016-05-06 23:39:33 -05:00
Vincent Lee afc5f93b55 Fix #265 2016-05-06 22:38:07 -05:00
Vincent Lee 072f13d3db Update JEI and add support for recipe category crafting items 2016-05-06 22:24:15 -05:00
Vincent Lee 5e11fe6e06 Removed model registration for last commit 2016-05-06 19:34:33 -05:00
Vincent Lee a3abfb6aad Removed buried petals and mana flash item forms. Closes #268 2016-05-06 19:30:58 -05:00
Vincent Lee c0c1db1aa7 Fix #267 2016-05-06 19:11:33 -05:00
Vincent Lee e99d5dff63 Update to recommended forge, removed useless synchronization in ManaNetworkHandler 2016-05-06 18:49:11 -05:00
Vincent Lee 1b144e6b58 Fix #264 2016-05-04 19:32:33 -05:00
Vincent Lee 7dcd0281b8 Actually commit new zip 2016-05-04 18:58:15 -05:00
Vincent Lee 2d412ac70f Various cleanups, updated alt textures to 1.9 2016-05-04 18:38:09 -05:00
Vincent Lee a0d251fafd Update forge and close #245 2016-05-03 12:38:52 -05:00
Vincent Lee f24409f336 Add workarounds for the silly forge light bug. Closes #221, probably closes #251 as well 2016-05-03 11:31:59 -05:00
Vincent Lee 7a66a9756b Revert stupid find replace hit 2016-05-02 22:08:10 -05:00
Vincent Lee a802650289 Merge branch 'derpbranch' into MC19 2016-05-02 22:06:29 -05:00
Vincent Lee 130c67e758 Fully serverside gaia guardian, buff it a bit 2016-05-02 22:05:35 -05:00
Vincent Lee d0e2f474bc Resync hourglass whenever it flips, hopefully helps with desyncs 2016-05-02 20:14:46 -05:00
Vincent Lee 6889afc34e Delete old models 2016-05-02 19:59:08 -05:00
Vincent Lee bb152907a7 Fix TESR item transforms 2016-05-02 19:45:30 -05:00
Vincent Lee 3996c5d078 Guard against null chunk in packethandler 2016-05-02 19:24:13 -05:00
Vincent Lee 8f4f63453a Move nonfabulous pools into static renderer. Yay performance improvements! 2016-05-02 19:20:31 -05:00
Vincent Lee 725ae1cef1 Fix crystal cube, closes #253 2016-05-02 08:34:30 -05:00
Vincent Lee 93656a9d43 Fix+tweak paint lens particles 2016-05-01 22:43:33 -05:00
Vincent Lee 96a1db97a9 Serverside TilePool 2016-05-01 22:03:58 -05:00
Vincent Lee a339397fcc Some network boilerplate 2016-05-01 21:25:30 -05:00
Vincent Lee e37255a997 Make platform disappear with managlass, and fix version checker 2016-05-01 11:42:40 -05:00
Vincent Lee 95427b1c9d Fix missing texture on fungal apothecary 2016-04-30 14:03:09 -05:00
Vincent Lee 4a6bf0ed0d Fix incorrect horn sound. Closes #257 2016-04-30 13:26:05 -05:00
Vincent Lee b6827ca04e Remove new cooldown from signal flare, remove redundant check from fire/rainbowrod 2016-04-29 08:15:54 -05:00
Vincent Lee 45df392cce Close #259 2016-04-28 23:37:20 -05:00
Vincent Lee abf5d9672b Make some items use new cooldowns, closes #261 2016-04-28 23:34:40 -05:00
Vincent Lee dc35d395cf Some balance changes 2016-04-27 19:26:56 -05:00
Vincent Lee fca4e2bfa8 Properly check kekimurus. Closes #255 2016-04-27 17:23:00 -05:00
Vincent Lee 543b5a1958 Guard against null item stacks in OD -.-. Closes #254 2016-04-27 17:20:18 -05:00
Vincent Lee f8d18ae769 All other sound subtitles 2016-04-23 22:03:27 -05:00
Vincent Lee 6d350451fc Some sound subtitles 2016-04-23 21:05:11 -05:00
Vincent Lee 5d1829a00e Camo block now respects directional blocks. Closes #110 2016-04-23 18:44:32 -05:00
Vincent Lee 16f6289844 Fix dupe dropping with psi. Closes #250 2016-04-23 16:02:02 -05:00
Vincent Lee be155e0abb Tweak lexicon hud, closes #241 2016-04-20 19:47:48 -05:00
Vincent Lee 2ad607bff3 Show all buffs on first row 2016-04-20 19:39:24 -05:00
Wire Segal b090622477 Add a ManaUpgradeRecipe. (#218)
third pr for recipes, yay
2016-04-17 22:07:41 -05:00
Vincent Lee af5e9f7751 Fix grisaia crash. Closes #242 2016-04-17 21:28:27 -05:00
Vincent Lee b32f834a73 Go back to meta for now, should close #183 2016-04-17 20:53:12 -05:00
Vincent Lee d34e3453fe Fix bow not being able to fire, Closes #238 2016-04-17 20:49:27 -05:00
Vincent Lee 5d5109d6d1 Fix some items not being colored. Closes #240 2016-04-17 20:41:51 -05:00
Vincent Lee a838427df8 Finalized migration mechanisms 2016-04-17 20:32:17 -05:00
Vincent Lee 55262cd4e5 Update nag message, add migration recipes for everything 2016-04-17 20:03:31 -05:00
Vincent Lee de0ba4ada9 Revert "Upload remapping code for troubleshooting"
This reverts commit 9309355af2.
2016-04-17 12:00:49 -05:00
Vincent Lee 5bf1c26ffb Make some conditionals smarter 2016-04-17 00:35:09 -05:00
Vincent Lee dd300ea32f Convert gaia guardian to loot tables and fix gg music 2016-04-17 00:31:47 -05:00
Vincent Lee b7fead0e4d Initial stuff 2016-04-16 17:34:17 -05:00
Vincent Lee 905a372708 Add remap for full slabs 2016-04-15 20:06:44 -05:00
Vincent Lee 9309355af2 Upload remapping code for troubleshooting 2016-04-15 19:24:36 -05:00
Vincent Lee 910dfc25db Fix derp 2016-04-15 10:17:39 -05:00
Vincent Lee 0ad2a4f218 Fix boss bar rendering, music still not playing 2016-04-15 10:16:46 -05:00
Vincent Lee b479284760 Fix throwables 2016-04-14 23:00:55 -05:00
Vincent Lee 0a396b0d82 Full optimize imports 2016-04-14 22:49:49 -05:00
Vincent Lee 3f85ca5805 Remove isFull3D as it's no longer used for anything 2016-04-14 22:45:31 -05:00
Vincent Lee 9f60ac59fa Remove old flugel code. This is what git is for :P 2016-04-14 22:42:46 -05:00
Vincent Lee f01b8a1fa9 Prevent paint lens from painting blocks illegal colors 2016-04-14 22:39:26 -05:00
Vincent Lee 8c3d1bde14 Tweak equip sounds, boost thundercaller's attack speed 2016-04-14 22:37:26 -05:00
Vincent Lee a782017852 Remove old remappers 2016-04-14 22:21:55 -05:00
Vincent Lee b9fcf9bd53 Modernize ice pendant. Now acts like frost walker VIII and doesn't require player to be touching ground 2016-04-14 22:18:37 -05:00
Vincent Lee 391eea0416 Minor optimization in jaded ama, closes #186 kinda maybe 2016-04-14 22:05:09 -05:00
Vincent Lee a4279647fa Tweak previous pr 2016-04-14 22:02:40 -05:00
Wire Segal 9e82e5357a Armor keeps enchantments when crafted (#213)
* Armor keeps enchantments when crafted

Closes #209

* Copy runic shielding as well
2016-04-14 21:59:36 -05:00
Vincent Lee d33590f7ca Fix bounding box issue causing bindings to fail. Closes #234 2016-04-14 21:39:43 -05:00
Vincent Lee 45dda5f19c Fix vine balls and tweak slightly 2016-04-14 00:23:29 -05:00
Vincent Lee be9fba512b Fix stair json weirdness 2016-04-13 17:30:26 -05:00
Vincent Lee f219836f81 update canBlockRenderInLayer 2016-04-13 16:20:38 -05:00
Vincent Lee 2c75af2359 Build 301 2016-04-13 10:09:30 -05:00
Vincent Lee 86b6962f94 Minor optimization in MathHelper, cleanup for rel 2016-04-13 09:57:17 -05:00
Vincent Lee 26831d3e98 Tweaks to heisei dream inner workings 2016-04-13 09:48:29 -05:00
Vincent Lee a6c2631946 Cleanup prev commit 2016-04-12 13:47:18 -05:00
Vincent Lee 7a36e543ad Experiemntally convert mana network to using sets 2016-04-12 12:28:58 -05:00
Vincent Lee 649dffcf71 Moar cleanups! 2016-04-12 01:32:49 -05:00
Vincent Lee b3ee6dcf7a More cleanup, brews now average their potion colors instead picking the first 2016-04-12 00:51:09 -05:00
Vincent Lee 69cbecb521 More cleanup, Full pool for JEI handlers 2016-04-11 23:22:02 -05:00
Vincent Lee effd07129c A round of FindBugs, and fix red interceptor not working at all 2016-04-11 22:47:24 -05:00
Vincent Lee e73feae688 Tweak horse inv dropping again 2016-04-11 21:44:30 -05:00
Vincent Lee cee7a965a5 Tweak horse inv dropping 2016-04-11 21:17:42 -05:00
Vincent Lee 07f3099071 Force relay tweaks, hopefully resolves #232 2016-04-11 20:55:11 -05:00
Vincent Lee 70cc32a839 Add RenderFull NBT tag override to pools. Closes #228 2016-04-11 20:18:41 -05:00
Vincent Lee 50eeb06bf6 Remove useless line. Make horse drop all items when being virused, closes #189 2016-04-11 19:43:18 -05:00
Vincent Lee d97b2ceb1d Fix pool's north wall being slightly taller, Fix pump item model 2016-04-09 22:43:50 -05:00
Vincent Lee 209970b60c Fix bauble box gui. Closes #185 2016-04-09 21:37:41 -05:00
Vincent Lee 5cdf48393a Fix top half of double flowers not sparkling with correct color. Also disable random offsetting because it's broken 2016-04-09 21:25:41 -05:00
Vincent Lee 533a287bd3 Allow vanilla flowers to be ground directly into powder. Closes #215 2016-04-09 21:03:51 -05:00
Vincent Lee 7c61b1b9d3 Misc cleanup, fix hud catalyst, test gpg sign 2016-04-09 20:26:04 -05:00
Vincent Lee 4a9c269a67 Clean up terra firma rod code 2016-04-08 13:24:44 -05:00
Vincent Lee 1a7e128ae5 Merge pull request #224 from yrsegal/19FixTerraformRod
Fix the Rod of the Terra Firma not working
2016-04-08 12:59:00 -05:00
Vincent Lee be09676053 Use == 2016-04-08 12:37:13 -05:00
Vincent Lee 11d327dcce Merge branch 'MC19' of github.com:williewillus/Botania into MC19 2016-04-08 12:32:59 -05:00
Vincent Lee 5df661bf28 Merge pull request #227 from yrsegal/Catalysts
Catalysts can accept any catalyst BlockState.
2016-04-08 12:32:41 -05:00
yrsegal fa8c12d6fc Catalysts can accept any catalyst BlockState.
This constitutes a major, but not breaking, API update. All catalyst
methods previously in RecipeManaInfusion have been deprecated.
2016-04-07 21:50:28 -04:00
yrsegal 39a44642e4 Fix the Rod of the Terra Firma not working
Closes #191
2016-04-06 18:58:39 -04:00
Vincent Lee bcecfb9148 Merge pull request #222 from yrsegal/19FixMunchdew
Fix munchdew not working
2016-04-06 17:43:06 -05:00
yrsegal 1f11359b23 Fix munchdew not working
Closes #220
2016-04-06 18:14:07 -04:00
Vincent Lee 4ec22a0417 Merge upstream 2016-04-06 09:51:50 -05:00
Vincent Lee 8a6189cbd2 Fix mana tablet rendering 2016-04-06 09:48:28 -05:00
Vincent Lee 796d231867 Fix wall digging textures 2016-04-05 13:20:37 -05:00
Vincent Lee fb0a414443 Rename build to fix stupid issues 2016-04-05 08:51:10 -05:00
Vincent Lee ae57ace7e8 Fix spreader item model, misc fixes, update forge to 1841 so all interact events are back 2016-04-04 21:03:12 -05:00
Vincent Lee f011be3571 Switch last commit to shaders. Thanks PaleoCrafter! 2016-04-04 13:32:36 -05:00
Vincent Lee 109d045a4d Fix ugly multiblock rendering 2016-04-04 13:09:02 -05:00
Vincent Lee 32fb1bcf6d Fix contributor renders. Closes #200 2016-04-04 09:47:02 -05:00
Vincent Lee 529c41407f Allow mana guns to be dual wielded 2016-04-04 09:30:52 -05:00
Vincent Lee ea6484211b API cleanups 2016-04-03 23:26:20 -05:00
Vincent Lee 53ce019cf5 Various misc cleanups 2016-04-03 23:07:24 -05:00
Vincent Lee eec7c8ba59 Fix missing center model for panes. Closes #208 2016-04-03 21:25:55 -05:00
Vincent Lee c07febc67d Merge branch 'MC19' of github.com:williewillus/Botania into MC19 2016-04-03 21:23:18 -05:00
Vincent Lee 08550cc442 Cleanup 2016-04-03 21:23:04 -05:00
Vincent Lee 82fa306a5c Merge pull request #207 from yrsegal/19Patch
Fix invalid color combination
2016-04-03 21:03:21 -05:00
yrsegal 63a5bdee1c Fix invalid color combination 2016-04-03 21:54:36 -04:00
Vincent Lee f8157f1222 Fix erratic colorization of bursts and flashes
Fix erratic colorization of bursts and flashes
2016-04-03 20:50:14 -05:00
yrsegal 7536ebe4c6 Fix erratic colorization of bursts and flashes
closes #198
2016-04-03 21:38:42 -04:00
Vincent Lee af19c7cece Update kekimurus for extra slice of cake in 1.8 2016-04-03 20:23:05 -05:00
Vincent Lee 43395f9441 Fix walls appearing in vanilla creative tab. Closes #190 2016-04-03 20:08:58 -05:00
Vincent Lee 97495a913d Cleanup walls 2016-04-03 19:59:58 -05:00
Vincent Lee 1d901ec9ac Fix panes. Closes #204 2016-04-03 19:39:05 -05:00
Vincent Lee 62b39ee682 Fix crash serverside. Closes #197 2016-04-03 19:00:20 -05:00
Vincent Lee 759bf2835d Merge branch 'MC19' of github.com:williewillus/Botania into MC19 2016-04-03 18:47:57 -05:00
Vincent Lee 69db133091 Update forge 2016-04-03 18:47:31 -05:00
Wire Segal 5ceceec6bb Various minor fixes
* Fix Lexicon crashing with invalid version format

Closes #192

* Fix crashing on damage taken

Closes #196

* Fix attributes being too present/wrong values

Closes #194
2016-04-03 17:01:24 -05:00
Vincent Lee 5f3172bd5d Cleanup, fix soulscribe holding 2016-04-01 16:51:30 -05:00
Vincent Lee 79c8e3d695 various miscellaneous fixes 2016-03-31 01:09:46 -05:00
Vincent Lee f5b435bf24 Model cleanup 2016-03-30 23:26:06 -05:00
Vincent Lee b6d607b553 Bow tweaks 2016-03-27 14:07:27 -05:00
Vincent Lee d411fac65c Half fix floating flowers 2016-03-27 13:35:12 -05:00
Vincent Lee 9bc724d6fd Fix flower models 2016-03-27 12:45:48 -05:00
Vincent Lee bcd00dbba3 Update JEI, more overrides 2016-03-27 12:05:19 -05:00
Vincent Lee c8531fde67 Update forge, some more model overrides 2016-03-27 00:30:45 -05:00
Vincent Lee 4771ec5bdb Some item overrides, fix bow firing 2016-03-24 14:41:10 -05:00
Vincent Lee ecb0f8a4be Fix bow models 2016-03-24 13:47:58 -05:00
Vincent Lee ab618923df Fix some methodhandles 2016-03-24 13:01:07 -05:00
Vincent Lee 674ba5c19d Fix somde models 2016-03-24 12:30:14 -05:00
Vincent Lee 1b87160ef6 Register the potions 2016-03-24 09:45:56 -05:00
Vincent Lee ec419edfe3 Fix sounds 2016-03-24 09:13:15 -05:00
Vincent Lee 5b9a5bf480 Update most reflection names 2016-03-24 00:02:36 -05:00
Vincent Lee 1b79575648 Fix other models 2016-03-23 23:47:06 -05:00
Vincent Lee 0ba32450cf Fix stairs 2016-03-23 23:31:08 -05:00
Vincent Lee 400f6583ad Fix item models 2016-03-23 23:10:22 -05:00
Vincent Lee 365bed04c0 Flowers not working 2016-03-23 22:10:38 -05:00
Vincent Lee 3e79893a35 Barely runs 2016-03-23 21:34:19 -05:00
Vincent Lee d37518c9f4 Compiles. Update JEI. 2016-03-19 15:58:12 -05:00
Vincent Lee 0af2d25a71 Misc fixes, fix baked models 2016-03-19 11:38:16 -05:00
Vincent Lee 268a8afda5 Most TE's 2016-03-19 09:59:45 -05:00
Vincent Lee 5cc6879ecb Lots of blocks 2016-03-18 23:08:49 -05:00
Vincent Lee a268149d73 Misc rendering 2016-03-18 20:42:43 -05:00
Vincent Lee fe16702db4 Brews and potions 2016-03-18 20:26:53 -05:00
Vincent Lee c23b9dcaee Some blocks 2016-03-18 20:20:23 -05:00
Vincent Lee 663c797cf3 More items 2016-03-18 20:01:50 -05:00
Vincent Lee 3852282598 Missed two 2016-03-18 19:03:35 -05:00
Vincent Lee 3dd877e69a Color handling 2016-03-18 18:59:23 -05:00
Vincent Lee 1c608d4636 A lot of items. Rods, and lenses. 2016-03-18 16:51:21 -05:00
Vincent Lee cfbf2cc538 Entities 2016-03-18 14:47:38 -05:00
Vincent Lee 017829927f Some blocks 2016-03-18 13:26:42 -05:00
Vincent Lee 644d6553d1 Large amounts of stuff in client 2016-03-18 13:17:33 -05:00
Vincent Lee 58e06ae86b Most of API 2016-03-18 12:30:10 -05:00
Vincent Lee 3bb203e371 More rename substitutions 2016-03-18 11:07:42 -05:00
Vincent Lee 5821ede5e6 Lots of name substitutions 2016-03-18 10:42:42 -05:00
Vincent Lee 316363d729 Remove redundant check on jaded amaranthus 2016-03-18 00:02:40 -05:00
Vincent Lee 6622ec5270 Removeold potion handlers 2016-03-16 22:54:47 -05:00
Vincent Lee f86f42b895 Fix infinite potion spam with sponge 2016-03-14 15:40:49 -05:00
Vincent Lee b9b7a4e07d Finish waterbowl fancification 2016-03-14 13:37:10 -05:00
Vincent Lee 199243c120 waterbowl fancification attempt 2016-03-14 12:46:29 -05:00
Vincent Lee 4b056375d4 Fix pump trying to animate serverside. Closes #181 2016-03-13 12:30:12 -05:00
Vincent Lee 8e550e36d2 Revert "Fix particles being culled at render distance. Closes #15"
This reverts commit 9a756ef79e.
2016-03-13 12:26:21 -05:00
Vincent Lee 9a756ef79e Fix particles being culled at render distance. Closes #15 2016-03-12 21:12:09 -06:00
Vincent Lee bead93c653 Minor memory optimization, fix JEI integration for magical flowers 2016-03-12 20:48:48 -06:00
Vincent Lee e2596f4511 Fix red string comparator not binding, closes #179 2016-03-12 20:39:07 -06:00
Vincent Lee ec1cc498ce Build 299 2016-03-12 20:38:49 -06:00
Vincent Lee 8f67094377 Tweak nag and version checker 2016-03-12 16:50:28 -06:00
Vincent Lee 2172d78dd2 Disable the background downloader for now, at least til we get a file server 2016-03-12 16:36:44 -06:00
Vincent Lee 099c02157e Update buildscript and update checker 2016-03-12 16:26:59 -06:00
Vincent Lee 3cc7099ab2 Fix itemfinder crash. Closes #176 2016-03-12 14:48:45 -06:00
Vincent Lee f1403a4577 Fix terra pick mass harvesting. closes #175 2016-03-12 13:27:47 -06:00
Vincent Lee 64e1282444 Done! 2016-03-12 00:59:11 -06:00
Vincent Lee 949fdde057 Made the old model not render in 1p 2016-03-12 00:51:34 -06:00
Vincent Lee e031b3b52c In working state 2016-03-12 00:23:51 -06:00
Vincent Lee 55c2a522ee Preliminary 3d lexicon 2016-03-11 23:22:38 -06:00
Vincent Lee cf7f10d082 Fix the pump textures 2016-03-11 22:02:45 -06:00
Vincent Lee 8909b26e99 Update buildscript 2016-03-11 16:04:31 -06:00
Vincent Lee 3534a6cc5f Close #174 2016-03-11 13:14:42 -06:00
Vincent Lee 95f8cc529f Fix dark quartz slab model 2016-03-11 09:38:08 -06:00
Vincent Lee 4c1b15b336 nullcheck spark item. Closes #173 2016-03-09 20:50:58 -06:00
Vincent Lee 4bad74dbfd Workaround for a jei integration problem, closes #172 2016-03-09 20:27:55 -06:00
Vincent Lee f5b71f9db1 Possible fixes for #171 2016-03-09 15:44:14 -06:00
Vincent Lee 769528ceed Fix prism not resyncing when being automated 2016-03-09 09:56:30 -06:00
Vincent Lee 84e38b5a32 Fix nonssmooth turntable animation. Closes #169 2016-03-09 09:35:45 -06:00
Vincent Lee 3a9f0b346e Fix inverted redstone conditions in prism. Closes #167 2016-03-08 22:44:31 -06:00
Vincent Lee 3097dde357 Restore storage drawers compat, closes #166 2016-03-08 10:57:19 -06:00
Vincent Lee e25cf207a6 Let rabbits spawn from cocoon of cparice 2016-03-07 20:46:05 -06:00
Vincent Lee c74e77d9fc Fix corporea index stars being too bright 2016-03-07 20:44:22 -06:00
Vincent Lee c105b606c4 Moar capability fixes. Closes #165 2016-03-07 20:26:52 -06:00
Vincent Lee 93174616c7 Fall back to null sided cap 2016-03-07 14:01:13 -06:00
Vincent Lee 63f160b78b A reference <3 2016-03-07 13:40:08 -06:00
Vincent Lee bb89013f1e According to lexicon sparks only read from top of inventory 2016-03-07 13:36:27 -06:00
Vincent Lee 1229141b2f Fix sparks not being colored by network 2016-03-07 13:20:49 -06:00
Vincent Lee 9f1a2b8a7d Retrofit corporea to work with capabilities 2016-03-07 13:09:59 -06:00
Vincent Lee cda20175c8 Fix derp when removing workaround. closes #161, #162, #163 2016-03-07 09:40:02 -06:00
Vincent Lee 46ec4b8127 Tweak guard in shedding config. Closes #153 2016-03-06 17:50:55 -06:00
Vincent Lee 8f46355769 Spreader item models. Closes #4. Also fix third person pool model and restore old lexicon model until I'm ready to tackle it 2016-03-06 14:19:28 -06:00
Vincent Lee 93f869a8f5 Removed duplicate pool textures 2016-03-06 12:20:34 -06:00
Vincent Lee 3084b058da Cleanups in API 2016-03-05 22:02:22 -06:00
Vincent Lee db23bffea6 Remove future references to 1.8 from lang file 2016-03-05 20:43:03 -06:00
Vincent Lee 0d9fe52f5d Merge branch 'capability' into MC18 2016-03-05 20:30:08 -06:00
Vincent Lee 036fc4b0cc Use cap's native serialization 2016-03-05 12:12:29 -06:00
Vincent Lee 67bcd94edf Fix inverted potion condition 2016-03-05 09:30:44 -06:00
Vincent Lee 9975f4b028 Make piston relays not stringly typed 2016-03-05 01:34:00 -06:00
Vincent Lee 274b4ab05a onContentsChanged exists 2016-03-04 23:07:16 -06:00
Vincent Lee b581a5544b Fix memory usage problem caused by vanilla 2016-03-04 22:22:07 -06:00
Vincent Lee 28f4321cfb Derp missed one 2016-03-04 21:33:28 -06:00
Vincent Lee 3c5f588431 Get rid of BlockContainer 2016-03-04 11:01:55 -06:00
Vincent Lee 19ed5877df Make API java 7 compileable, so that people who have an optional botania dep don't have to use java 8 2016-03-03 10:33:57 -06:00
Vincent Lee 2f1bc4188a Prevent mobs from riding pool cart 2016-03-03 09:49:15 -06:00
Vincent Lee 9aa6405566 Remove debug output 2016-03-02 22:14:08 -06:00
Vincent Lee 40bad433c8 Fel pumpkin can now be placed from dispensers 2016-03-02 22:13:45 -06:00
Vincent Lee 01ca175951 Remove tile ticking shim 2016-03-02 14:15:45 -06:00
Vincent Lee 298d46399f Derp 2016-03-02 14:01:40 -06:00
Vincent Lee a929156626 Fix overeager TE refreshing. Closes #152 and potentially fixes #71 2016-03-02 10:30:46 -06:00
Vincent Lee 70942d7089 Fix faulty pane culling (vanilla bug) 2016-02-29 21:49:54 -06:00
Vincent Lee 38ca4b429d Fix recipe conflicts, making chiseled botania bricks craftable again. Closes #29 2016-02-29 21:30:33 -06:00
Vincent Lee be9e4f731f Fix nulls getting into FakeWorldAccess. Closes #143 2016-02-29 20:41:53 -06:00
Vincent Lee fefb5b5cc4 Tweak corporea funnel lexicon entry, closes #144 2016-02-29 20:35:48 -06:00
Vincent Lee 1c752992cf Fix bore+warp lenses breaking the destination block. Closes #149 2016-02-29 20:18:43 -06:00
Vincent Lee c6420168aa Fix another problem caused by shifting idmap. Closes #147 2016-02-29 19:00:15 -06:00
Vincent Lee ae89d0f18d Shim to avoid potion idmap shifting on startup. Closes #148 2016-02-29 18:56:08 -06:00
Vincent Lee ef2ab91b37 All basic tiles 2016-02-28 20:46:01 -06:00
Vincent Lee 59232209a4 Redstrings 2016-02-28 15:57:59 -06:00
Vincent Lee 20ab306985 Merge branch 'MC18' into capability 2016-02-28 15:45:20 -06:00
Vincent Lee 076a7ee23a Tweak tesr guards. closes #142 2016-02-28 14:58:18 -06:00
Vincent Lee b12cd80ad3 Update forge and close #52 2016-02-28 12:20:11 -06:00
Vincent Lee 6d7fe40cd3 Fix pink wither being too aggressive in showing its love. Closes #141 2016-02-28 11:48:42 -06:00
Vincent Lee e4401efeb6 Hopperhock 2016-02-28 10:53:01 -06:00
Vincent Lee a3c30caa40 Make it compile 2016-02-28 01:44:16 -06:00
Vincent Lee 1580790398 Merge upstream final release 2016-02-28 01:29:25 -06:00
Vincent Lee 8f89b630a5 Merge pull request #140 from blacksmithgu/MC18
Update ItemManaRing to also use durability bar instead of damage
2016-02-28 01:16:54 -06:00
Michael Brenan 861357f313 Update ItemManaRing to also use durability bar instead of damage 2016-02-27 23:40:25 -06:00
Vincent Lee 84b171603d Fix planestrider's sash. Closes #139 2016-02-27 15:31:50 -06:00
Vincent Lee ae356abcfe Reorganize 2016-02-27 14:12:39 -06:00
Vincent Lee d498b7cd2e Fix floating flower spinning (thanks gigaherz and tterrag) Closes #9 2016-02-26 21:15:31 -06:00
Vincent Lee 50420c3b4b Sigh 2016-02-26 20:39:50 -06:00
Vincent Lee 99e9cac30a Merge branch 'MC18' of github.com:williewillus/Botania into MC18 2016-02-26 19:53:12 -06:00
Vincent Lee 18ea3e6bfb Pure daisy now allows variable time recipes, closes #137. 2016-02-26 19:48:43 -06:00
Vincent Lee f51540fd52 Update README.md 2016-02-25 14:56:00 -06:00
Vincent Lee 47001131b0 Move specialflower statemapper to where it belongs 2016-02-22 23:17:52 -06:00
Vincent Lee 1ed833a4a7 Fix mistake in spawnerclaw, made debug atlas dump harder to trigger 2016-02-22 23:10:01 -06:00
Vincent Lee 9d6c10f354 Slight tweaks to corporea cube rendering 2016-02-22 22:03:57 -06:00
Vincent Lee 9b3579fe56 Fix touching client classes in methodhandles. Closes #129 2016-02-21 17:03:28 -06:00
Vincent Lee d7d4440b0e Update spawner claw to use methodhandles 2016-02-20 18:19:03 -06:00
Vincent Lee 91d234e6ed Fix life aggregator being completely broken 2016-02-20 17:40:20 -06:00
Vincent Lee b4d69dbac2 Fix aesir not binding drops to uuid 2016-02-20 17:26:29 -06:00
Vincent Lee 7967f25c1c Change a bunch of heavy reflection to use methodhandles 2016-02-20 17:24:31 -06:00
Vincent Lee b6427bcae9 Merge branch 'MC18' of github.com:williewillus/Botania into MC18 2016-02-20 13:34:46 -06:00
Vincent Lee 90f793508a Tentative uuid fix for relics. #124 2016-02-20 13:34:16 -06:00
Vincent Lee db6ccb9016 Merge pull request #123 from kevsgrove/patch-1
Update BlockSolidVines.java
2016-02-19 12:44:10 -06:00
kevsgrove 59939824a3 Update BlockSolidVines.java 2016-02-19 07:08:12 -08:00
Vincent Lee ad5b7fd73b Merge upstream 2016-02-18 10:04:02 -06:00
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
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
Katrix- d1c309f8ae UUID for relics
Maybe better name for a few uuid methods?
2015-12-27 03:44:40 +01: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
2492 changed files with 46989 additions and 39118 deletions

No files matched your search

Binary file not shown.
BIN
View File
Binary file not shown.
+15
View File
@@ -1,3 +1,18 @@
README:
This is williewillus' port and continuation of Botania for Minecraft versions 1.8.x and above
All licensing and distribution rights are exactly as 1.7.10 Botania.
Use at your own risk as bugs may pop up unexpectedly.
As of 2016 02 25, Vazkii has stopped working on Botania. Requests for design changes will still not be accepted here (post them on reddit). Even then, don't expect anything to be added without severe deliberation scrutiny.
Please report all 1.8+ issues to this repository.
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 2492 files, more files were not shown because too many files have changed in this diff. Show more