lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
1292 commits 12 branches 0 tags 44 MiB
Commit graph

994 commits

Author SHA1 Message Date
Nick 76b3c14499 AddToNetworkEvent should be cancellable 2016-03-14 18:55:05 -07:00
WayofTime 22bd2f0628 Fixed WillChunks so that you should not get a null chunk when requested. 2016-03-14 20:16:31 -04:00
qianzha 8c1380662b Update zh_CN.lang 2016-03-12 20:09:38 +08:00
WayofTime cbe858e581 Fixed Hellfire Forge's GUI 2016-03-07 06:39:37 -05:00
WayofTime 4fd39b6348 Fixed altar crashing 2016-03-07 06:30:58 -05:00
Nick 126d17b55d Clean up some javadoc spam 
Still need to figure out why delombok is priting an error for every non-BM import. It was apparently fixed in `gradle-lombok` 1.5 but it seems to have returned.
 2016-03-02 12:56:57 -08:00
Nick fe18be56fd Update graphic for Altar page in docs 
Removes the Sanguimancy part and use new graphical style
 2016-03-01 13:45:45 -08:00
Nick 5cd44fd40c Change node beam texture to an internal one 
So @Yulife shuts up about it :P
 2016-03-01 09:09:21 -08:00
Nick 3f8cccf056 Config to only render routing lines while an INodeRenderer is held 
Current INodeRenderer's are the Node Router and all Routing Nodes
 2016-02-29 23:20:57 -08:00
WayofTime 507d41111d Reverted GuiButton variables to standard method. 2016-02-27 19:37:42 -05:00
WayofTime 6b52b5131b Merge pull request #649 from Arcaratus/1.8 
Routing node cleanup
 2016-02-27 19:35:03 -05:00
WayofTime 7106579201 Updated changelog and added recipes. Also created behaviour for the crystals to drop single crystals. 2016-02-27 19:34:42 -05:00
WayofTime 620023d098 Fully implemented discrete demon will, which means the demon crystals can be inserted into demon crucibles to create will. 2016-02-27 16:36:56 -05:00
Arcaratus e89451ed36 Routing node cleanup 2016-02-27 11:38:40 -05:00
Nick 83c1497609 Put the breaks on the model spam train 
OBJs are noisy
 2016-02-26 22:36:52 -08:00
Nick f21e97063a Fix formatting + tooltips 2016-02-26 21:35:41 -08:00
Nick 8d5e9c125b Initial stab at documentation 2016-02-26 21:22:34 -08:00
WayofTime 70f4c117d7 Added growth method for the crystals. 2016-02-26 22:11:28 -05:00
WayofTime ea24e7edd8 Created the proper rendering for the crystal clusters while in hand 2016-02-25 22:00:02 -05:00
WayofTime 19fec96bfd Added different types of Demon Will crystals. Obtainment method still TBD 2016-02-25 16:19:57 -05:00
WayofTime 8077962e08 Fixed brightness issue with crystals. 2016-02-25 11:29:48 -05:00
WayofTime 3fc6b5627f Testing translucent textures. 2016-02-25 10:45:00 -05:00
WayofTime da6f410394 Lots of import rearrangement due to odd "clean up" algorithm. Added Crystals, which are very WIP. 2016-02-25 08:54:18 -05:00
Nick 99c2b26c6b Durability for Inscription Tools 2016-02-23 22:48:34 -08:00
Nick 7af53ce85b Add AltarCraftedEvent 
Called after an altar has crafted an item. Not cancellable, however the output itemstack may be modified.
 2016-02-23 22:48:15 -08:00
Nick 45710ebb8f Some minor cleanup 
* Hid Dimensional Portal from JEI and Creative
* Fixed stacktrace spam when invalid portal was stepped into
* Fixed tank rendering no model at all
* Fixed NBT saving for Dimensional Portal
 2016-02-23 22:47:28 -08:00
Nick Ignoffo 5c5cda1917 Merge pull request #641 from Alex-hawks/1.8 
Add Capability support to Ritual Sones, Finish TE support as well
 2016-02-23 21:33:55 -08:00
WayofTime 743af85a61 Added Demon Pylon (currently no model) which pulls demon will from surrounding chunks into its chunk. 2016-02-23 13:40:08 -05:00
alex-hawks 33f05cd819 Add Capability support to Ritual Sones, Finish TE support as well 2016-02-24 01:52:52 +08:00
WayofTime 7104138e2b Implemented Priority System for the item routing system. Lower numbers are looked at first. 2016-02-22 21:19:22 -05:00
WayofTime 2c49c49441 Started work on Demon Will Inversion system. 2016-02-21 20:10:56 -05:00
WayofTime 0524daa16c Fixed suicidal portals in SMP 2016-02-21 13:26:09 -05:00
AngelCry 9fcd548273 Update ru_RU.lang 2016-02-21 05:05:22 +02:00
Nick 8393cca118 Blacklist Alchemy Array from JEI 2016-02-20 15:51:44 -08:00
WayofTime 37227d42f9 Fixed path blocks so they are actually craftable. 2016-02-20 15:34:16 -05:00
WayofTime 4a1cf11f6d Merge pull request #637 from Arcaratus/1.8 
Backwards rune recipes and texture fix
 2016-02-20 14:33:22 -05:00
Arcaratus f83838c8b1 Backwards rune recipes and texture fix 2016-02-20 14:30:35 -05:00
WayofTime c364ebf6ae Fixed armour so that it properly increments the upgrade points for extended play sessions. 2016-02-20 13:46:53 -05:00
WayofTime 8e8562e5a0 Minor fix to crushing ritual. Felling ritual's upkeep cost was reduced. 2016-02-19 20:11:29 -05:00
WayofTime b3636fe12f Fixed filters so that they would send a block update to the inventories when updated. Also nerfed the bound sword. 2016-02-19 19:47:58 -05:00
WayofTime a88d7f43b8 Created fillWill method for the tartaric gem. 2016-02-19 08:03:33 -05:00
NatsuArashi 9821f0c2c2 Update zh_TW.lang 2016-02-19 18:24:33 +08:00
Nick a056835a31 Move last PR into single event handlers 
Also includes a var in the main class for if we're running in an obf env or not. Use this for debugging
 2016-02-18 19:44:39 -08:00
Arcaratus da711c0461 Ritual holograms! 2016-02-18 21:59:10 -05:00
WayofTime 035ba94976 Reworked Tartaric Gems so that they contain specific demon will types (work for the future) 2016-02-18 18:00:02 -05:00
WayofTime e2e1b3c50f Merge branch '1.8' of https://github.com/WayofTime/BloodMagic into 1.8 2016-02-18 12:53:36 -05:00
WayofTime 70d0723dde Added recipes for sigils. Updated changelog for -18 release. 2016-02-18 12:53:04 -05:00
Nick a35aced93a Check if owner is set before syphoning 2016-02-18 09:51:58 -08:00
Nick 48622bf2e7 All Getter methods for lists/maps in registry now return new copies 2016-02-18 09:49:12 -08:00
Nick d997932306 Water Sigil can now fill the Cauldron (#617) 2016-02-18 09:37:31 -08:00
WayofTime 19bf728da3 Fixed rituals not correctly re-activating when taking off a redstone signal after reloading the world. 2016-02-18 12:26:42 -05:00
WayofTime 34a9b5a7ec Fixed Portal ritual. 2016-02-18 12:11:29 -05:00
Tombenpotter 7e8aec8652 Huge commit for the Pull-Request. 
Added a lot of things:
- Blood Tank
- Teleposition Sigil
- Transposition Sigil
- Cobblestone/Netherrack/Obisidian generation Ritual
- Tree Cutter Ritual
- Pump Ritual
- Altar Builder Ritual
- Block Placing Ritual
- Portal Ritual
- Teleportation System and API Components
- Cross pattern Area Descriptor
- Two reagents and their textures for the sigils’ crafting

Fixed:
- Teleposer not teleporting entities correctly

And probably other things I forgot!
 2016-02-18 17:25:11 +01:00
WayofTime d947f23696 Attempted to improve the crucible's logic. 2016-02-18 09:03:18 -05:00
Nick 29a8117771 Fix Spectral Block storing of block 2016-02-18 02:03:38 -08:00
Nick 4becdbf969 Update JEI to latest 
Fixes issue where setting "after:JEI@[1.2.3,)" would cause the blacklist to break.
 2016-02-18 00:06:25 -08:00
WayofTime c641f69809 Fixed a bit more logic of the demon crucible. 2016-02-17 21:23:13 -05:00
Nick 8a9b88d0cb Sigils now cut their description tooltip if too long 2016-02-17 16:10:16 -08:00
WayofTime ccb706f15c - Removed the FOV effect from the Quick Feet speed upgrade. 
- Minor work on the Demon Crucible.
 2016-02-17 16:31:11 -05:00
WayofTime 3e94aeae77 Added obj for WIP Demon Crucible (name pending). Fixed Floating Incense Altar syndrome. 2016-02-17 09:21:22 -05:00
Nick af193c3e5b JEI support for Blood Orb recipe type 
We can now move all the recipes over to Shape(d/less)BloodOrbRecipe
 2016-02-16 20:48:42 -08:00
Nick 65dd24b19b Move Revealing upgrade to tc compat class/package 2016-02-16 15:45:44 -08:00
Arcaratus abf54bf9af Beginning Thaumcraft compat 
Derp
 2016-02-16 18:41:59 -05:00
WayofTime 15650bac8b Amended range of Zephyr ritual 
Fixed Green Grove ritual
Fixed Crusher ritual so it didn't break everything at once.
 2016-02-16 11:46:47 -05:00
Nick 8f453f6e1e ItemBindable static methods now look for IBindable 2016-02-15 15:02:32 -08:00
Nick 58e51b9d51 Move IMC handling to it's own class 2016-02-15 15:01:03 -08:00
WayofTime 3c26dba99e Added recipe for the training bracelet. Combine in an anvil with an upgrade tome to set it as the upgrade to train 2016-02-15 17:20:33 -05:00
WayofTime db4c68e5f3 Added Ritual: Ritual of Living Evolution, which is used to set the living armour's max upgrade points to 300. 2016-02-15 17:13:50 -05:00
WayofTime 7610329d0a Added Ritual: Song of the Cleansing Soul to remove Living Armour upgrades from the armour. 2016-02-15 15:27:39 -05:00
WayofTime b5c8c2242a Fixed step height issues. 2016-02-15 13:36:47 -05:00
WayofTime 8ec653b2a7 Fixed lava crystal working even if there is no LP available. Causes a desync on server worlds. 2016-02-15 08:11:18 -05:00
WayofTime 18a36b9778 Fixed incense altar so that it checked two blocks above its level properly. 2016-02-15 07:11:02 -05:00
WayofTime 64efaf854b Implemented most of the framework required for training specific Living Armour Upgrades. 2016-02-14 21:50:32 -05:00
WayofTime 01d4bdffa2 Fixed Sacrificial Dagger so it properly bypasses armour reduction checks. 2016-02-14 08:26:19 -05:00
WayofTime 1787f50a65 Added recipes for various sigils. 2016-02-12 20:48:00 -05:00
WayofTime f195c5a486 Fixed bug where Living Armour would give its upgrades even if you didn't have the full set. 2016-02-12 20:24:20 -05:00
Nick 0828e965c6 Fix NPE when setting position of Teleposition Focus (#609) 2016-02-12 12:49:32 -08:00
WayofTime bb106e84ef Fixed tranquility check on seer sigil. 2016-02-12 06:27:44 -05:00
WayofTime 95354ad557 Added Runic Shielding upgrade to the Living Armour. 2016-02-11 17:53:20 -05:00
WayofTime 460df89e10 Fixed Blood Altar resetting when clicked with an item. 2016-02-11 15:56:08 -05:00
WayofTime c6b446faf9 Fixed uncommon error in the Seer and Divination sigils. 2016-02-11 15:44:32 -05:00
WayofTime 69eb621fc8 Finalized Solar Powered perk. Worked a bit more on Grim Reaper's Sprint. 2016-02-11 14:10:43 -05:00
WayofTime a5391840a4 Small change to docs in NetworkHelper. 2016-02-11 07:29:11 -05:00
Nick 04c0c32188 More work on moving models into ItemStates 2016-02-10 18:49:02 -08:00
Nick 325cda2f71 Begin cleaning up model registration 2016-02-09 19:07:56 -08:00
Nick f613c00970 Change Revealing upgrade to follow other upgrades 
Obtained the same way as before.
 2016-02-09 18:49:38 -08:00
Nick be0a93143d Blacklist some more NBT tags from JEI 2016-02-09 18:26:30 -08:00
WayofTime bb40cbb216 Fixed something 2016-02-09 21:08:54 -05:00
WayofTime 1d7b6febb9 Merge branch '1.8' of https://github.com/WayofTime/BloodMagic into 1.8 2016-02-09 20:22:18 -05:00
WayofTime 2be1d50541 Attempt to implement the Living Armour upgrade for the Grim Reaper's Sprint. 2016-02-09 20:22:14 -05:00
WayofTime 26d754cb9a Merge pull request #602 from Arcaratus/1.8 
Touched up Divination Sigil -> Incense Altar interaction
 2016-02-09 18:15:28 -05:00
Arcaratus a0b5571f96 Touched up Divination Sigil -> Incense Altar interaction 2016-02-09 18:13:18 -05:00
BBoldt 48ee1b7a33 final wood path blocks 2016-02-09 14:52:17 -08:00
WayofTime 4e054224ac Fixed step height issues with PotionBoost. Fixed some formatting errors. Set the path blocks' max path lengths. 2016-02-09 15:53:22 -05:00
NatsuArashi 3544bf8486 Update zh_TW.lang 
Items.
 2016-02-09 23:10:19 +08:00
Nick 82e802e936 Update JEI compat 2016-02-08 16:23:58 -08:00
WayofTime e4b724a6e4 Fixed routing nodes so that their parts do not fight when rendering. 2016-02-08 18:42:45 -05:00
Nick 5757fab22d Alchemy Array should only store a max stack size of 1 2016-02-08 14:41:58 -08:00
Nick faf4562df9 Bound tools now follow the BreakEvent (#79) 2016-02-08 14:17:56 -08:00
Nick effc378498 Fix format error with HellfireForge JEI compat 2016-02-08 13:56:31 -08:00