Commit graph

1162 commits

Author SHA1 Message Date
Nick Ignoffo 34d24c85dc Merge pull request #569 from wlhlm/update-german-translation
Update German translation
2016-01-17 12:35:58 -08:00
Nick e2a766aa79 Block bounds for the nodes + cleanup
AFAICT, the `shouldConnect` method works just fine like this.
2016-01-17 00:58:12 -08:00
Nick a9eb6a7b3b Disable ritual checking for enabled map
Does not work. Need to re-think. I swear I did this earlier.
2016-01-17 00:06:53 -08:00
WayofTime 7250dc8126 Reinitialized filter after fixing iterator. 2016-01-16 20:43:40 -05:00
WayofTime f1301f65d4 Removed filter code so that the CME would not occur until fixed. 2016-01-16 20:27:26 -05:00
WayofTime 1a908d64c6 Patch fix for concurrent modification exception 2016-01-16 20:11:25 -05:00
Nick c5b48ab59f Retain order of provided wills in JEI + only display valid will containers 2016-01-16 12:48:07 -08:00
WayofTime 815faa2ced Added routing filters as well as recipes and temp textures. 2016-01-16 11:10:58 -05:00
WayofTime 76dceb3534 Tinkered with the beam a bit. Added WIP models for the routing nodes. Added basic item routing node. 2016-01-15 21:53:55 -05:00
WayofTime 08e8ebf724 Fixes we can believe in! 2016-01-15 20:06:52 -05:00
WayofTime 9159ff8330 Working through Vazkii's "fixes" 2016-01-15 19:59:00 -05:00
WayofTime c028469174 Merge pull request #573 from Vazkii/patch-4
Fix fix!
2016-01-15 19:57:26 -05:00
Vasco Lavos 2a429239a1 Fix fix! 2016-01-16 00:56:59 +00:00
WayofTime 0ebf28e52c Merge pull request #572 from Vazkii/patch-3
Update beam.frag
2016-01-15 19:49:57 -05:00
Vasco Lavos 09153b1742 Update beam.frag 2016-01-16 00:46:47 +00:00
WayofTime 2c666a931e Now with fancy output blocks 2016-01-15 19:36:44 -05:00
WayofTime 07c138710c Fixed beam rendering so that it doesn't call Gl11 directly unless necessary. 2016-01-15 15:44:20 -05:00
WayofTime 4fe7439a61 Attempted to add some fancy rendering for the connections between nodes. 2016-01-15 15:06:03 -05:00
WayofTime 33ba7cc38f Iiiiinnnnnnnnnntegeeerrrrrrr 2016-01-15 06:44:26 -05:00
WayofTime e888907350 Fixed the LivingArmourHandler for defense so it no longer ate armour. 2016-01-15 06:24:10 -05:00
Nick b70c71f7be Remove all the old model and blockstate files 2016-01-14 21:24:24 -08:00
Wilhelm Schuster 7a98074e39 Update German translation 2016-01-15 02:10:02 +01:00
WayofTime 6a6369d08e Got the routing working to a safe degree. 2016-01-14 15:03:13 -05:00
WayofTime 652b6a45fd Initial framework for the item routing is completed 2016-01-14 14:11:16 -05:00
Nick eaefd89287 Remove potion array extending
It's already patched by Forge to be 256.
2016-01-14 09:34:21 -08:00
WayofTime a895809274 Added packet handlers, guis, etc required to handle the routing nodes. Added the ability to have a different filter for each direction. 2016-01-14 11:06:50 -05:00
WayofTime ac919c7882 Implemented ghost items for the inventory - will be adjusted. 2016-01-14 08:27:09 -05:00
WayofTime ec7676a69c Potential fix for a bunch of stuff that required the use of UUID -> username lookup on servers. This fix adds an extra tag to the NBT of items so that it caches the username of the owner. The UUID is still stored on items, but is not used client-side. 2016-01-13 19:59:28 -05:00
Arcaratus 81ba1ef3e1 Fixed up Bound Sword
Fixed Bound Items charge bar bug
2016-01-13 19:48:34 -05:00
Nick 14459ddc69 This call was not as redundant as I thought hehe 2016-01-13 16:35:38 -08:00
WayofTime 2b9cede308 Beginning work on the Master Routing Node 2016-01-13 19:32:50 -05:00
Nick 5ac78b2dea Should fix fakePlayer lookup NPE #546
I think it's safe to say that if the player is null here, the places we use this check should probably not continue. Will see how it goes.

Also added the check to imperfect rituals and removed a redundant check from the dagger.
2016-01-13 13:13:01 -08:00
WayofTime 9aac50542b Implemented a test filter - hasn't been tested! :D 2016-01-12 21:17:26 -05:00
Nick Ignoffo d4f8844660 Merge pull request #565 from Arcaratus/1.8-Rewrite
More rituals
2016-01-12 17:51:51 -08:00
Arcaratus 203a48d526 More rituals
More rituals

Comment out unimplemented portion

some thing useful

Renamed to something more useful
2016-01-12 20:51:05 -05:00
Nick 18280786d9 Add a description for the Demonic Will
Displays when looking up a recipe in JEI.
2016-01-12 16:50:18 -08:00
WayofTime 269459c5c5 Added a lot more framework for the node routing. 2016-01-12 17:05:56 -05:00
WayofTime 1b6e3442ae Fixed movement upgrade stat tracking. 2016-01-12 12:38:51 -05:00
WayofTime 8b0756e9da Added routing nodes and a bit of infrastructure - not even working yet. 2016-01-12 12:23:26 -05:00
Nick 9950b32d53 Fix Sigil of the Phantom Bridge
I'm tentatively considering this fixed. I'd rather not do it this way, but it seems to work...
2016-01-11 13:36:07 -08:00
Nick 0d70eb359e Fix spectral block NBT writing 2016-01-11 13:03:22 -08:00
Nick 99d6dfc513 Curse should no longer list us as 1.8.8 compatible 2016-01-11 12:51:43 -08:00
Nick cf19823855 Hide upgrade tomes from JEI unless they are max level 2016-01-11 12:28:08 -08:00
Nick 7f434d7f3e Temporary (?) durability bar for will full-ness 2016-01-11 02:05:08 -08:00
Nick Ignoffo 2d382ffaa9 Merge pull request #562 from BBoldt/1.8-Rewrite
Blood Orb fixes, soul gems, and soul snares
2016-01-11 01:43:18 -08:00
BBoldt 616d762150 Yulife/Inap's Blood Orb fixes, Soul Gems, and Soul Snare 2016-01-11 01:38:36 -08:00
Nick 20ca21a2c9 Remove loading with 1.8.8
We are no longer compatible with 1.8.8 due to the usage of `IRenderFactory` which was added in a 1.8.9 Forge release.
2016-01-10 17:09:18 -08:00
WayofTime 63783ed8ed Fixed upgrade localization in ItemLivingArmour 2016-01-10 19:27:13 -05:00
WayofTime 1abae8e4ee Implemented the ItemMeshDefinition for the Sentient Sword, allowing for me to make the sword enchantable while still allowing the texture to change. This may be expanded to other items. 2016-01-10 18:31:48 -05:00
Nick cb77b7821f No more mutli-line descriptions
We have a method for this
2016-01-10 14:37:47 -08:00