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

1288 commits

Author SHA1 Message Date
Nicholas Ignoffo b9464e3dbb Fix Elytra Wings in obf environments 
I forgot that obfuscation was a thing last night :D
 2016-05-31 16:14:15 -07:00
Yulife 889d943573 Elytra for Living Armour 
@TehNut , Credits to lemoncake__ for the Red Dragon Wings, I took
inspiration from those imgur.com/a/sI5cv
 2016-05-31 10:33:28 +02:00
Nicholas Ignoffo 5d96b9d2bd Add Elytra render for Elytra Upgrade 
Temporarily stole a texture for it from https://www.reddit.com/user/lemoncake__ (http://imgur.com/a/sI5cv) until @Yulife can make a real one.
 2016-05-30 19:48:28 -07:00
Nicholas Ignoffo 027787e3cd Fix logging levels of LogHelper 
Apparently this has always been wrong *shrug*
 2016-05-30 18:20:50 -07:00
Nicholas Ignoffo 512600a677 Split EventHandler into multiple different handlers 
Better organization allows for finding things easier
 2016-05-30 18:20:31 -07:00
Yulife 6e1383c6e0 Upgrade Trainer and Sheathed Tool 2016-05-30 13:49:43 +02:00
Nicholas Ignoffo 5aea7b637a Fix Green Grove Sigil destroying plants (#767) 2016-05-29 16:39:31 -07:00
WayofTime 3eb1c0f43d Updated the changelog as well as updated gradle.properties. Final commit for 2.0.1-40 2016-05-29 19:19:21 -04:00
Vexatos 6e8c05f464 Update de_DE.lang (#764) 2016-05-28 09:39:31 -04:00
Tridon343 21a69176da Update de_DE.lang (#730) 2016-05-28 08:24:29 -04:00
qianzha 9ab95320d8 Update zh_CN.lang (#734) 
* Update zh_CN.lang

* Update zh_CN.lang

* Update zh_CN.lang

* Update zh_CN.lang
 2016-05-28 08:23:57 -04:00
ImmortalPharaoh7 51fce309dd Update fr_FR.lang (#761) 2016-05-28 08:23:41 -04:00
Nicholas Ignoffo 439e830105 Fix commands for usage in Command Blocks (#748) 2016-05-28 05:19:50 -07:00
Nicholas Ignoffo a37cf7d60b Fix Tile data syncing (#763) 2016-05-28 04:53:19 -07:00
WayofTime bdf540aa76 Changed it so the Sentient Sword drops will for IMob instead of EntityMob - slimes have a 33% reduction to will drop. 2016-05-28 07:27:29 -04:00
WayofTime 5e0a390f48 Fixed Sigil of Magnetism and Call of the Zephyr picking up "dead" items. 2016-05-28 07:19:43 -04:00
Nicholas Ignoffo 3ac00ce4d6 Add recipe for Vengeful Crystal Clusters (#759) 2016-05-28 04:05:16 -07:00
Nicholas Ignoffo 36a5b7f6a1 Fix bound tools working on incorrect materials (#752) 2016-05-27 23:03:32 -07:00
Nicholas Ignoffo 6302ce8133 Fix Life Essence being solid (#751) 
Forge missed some fluid changes in 1.9.4.
 2016-05-27 22:55:40 -07:00
WayofTime aa3bef31c5 Fixed the Trick Shot upgrade 2016-05-22 12:09:36 -04:00
Nicholas Ignoffo cebf71c329 Fix Gate of the Fold endless loop (#743) 2016-05-21 12:57:04 -07:00
Nicholas Ignoffo dce6bf1e93 Add rune type colors Ritual Diviner tooltip 
Fixes casing for direction as well. IE: north -> North
 2016-05-21 12:47:17 -07:00
Nicholas Ignoffo 253da93b3e Make it clearer when arrow is not able to fire (#744) 
- Now does not fire an arrow (seems kinda obvious)
- Plays the "fire extinguish" sound as further indication.
 2016-05-20 22:39:54 -07:00
Nicholas Ignoffo c66b99b535 Remove things that shouldn't be there 2016-05-19 17:46:11 -07:00
Nicholas Ignoffo de5e23e6c4 package-info upd- I mean 1.9.4 update 
These are now "required" thanks to Mojang giving us some annotations. Yay..?
 2016-05-19 17:43:33 -07:00
Nicholas Ignoffo cb05e643a3 Crusher ritual should ignore unbreakable blocks 
Also does destroy effects when removing block
 2016-05-16 19:12:33 -07:00
WayofTime 1936e2d251 Fixed bound sword stuttering 2016-05-14 15:33:05 -04:00
Nicholas Ignoffo 0855c61943 Fix bound tool attributes (#741) 2016-05-13 17:05:40 -07:00
Nicholas Ignoffo d70f423a10 Fix NPE in Crusher ritual (#739) 
Also adds a utility for spawning an itemstack at a specific block location
 2016-05-13 16:50:07 -07:00
WayofTime b684aebdaa Fixed the Living Armour so that it wouldn't get damaged by self-sacrificing when you had upgrades that mitigate unblockable sources. 2016-05-12 15:44:12 -04:00
WayofTime e363ba8ffb - Fixed it so that the Sentient weaponry is actually repairable using any demon will crystals in an anvil 
- Changed the stat tracker for Tough Palms so that it counts number of hearts sacrificed, not number of sacrifices
 2016-05-12 14:51:42 -04:00
WayofTime 328b566064 Guesstimated the localization of the Fluid for Life Essence 2016-05-12 10:50:07 -04:00
Nicholas Ignoffo d8de125f52 Reduce debug commands perm level to support command blocks (#678) 2016-05-11 20:35:12 -07:00
Nicholas Ignoffo 3f28a9e268 Config for spectral block visible-ness 
true = Invisible (default)
false = Visible from the outside
 2016-05-11 20:30:23 -07:00
Nicholas Ignoffo 9253d6a410 Add an entity blacklist for the Teleposer (#701) 
Added event for when an entity is teleposed. Includes a Post version as well to allow modification of the entity after the fact.
 2016-05-11 20:29:16 -07:00
Nicholas Ignoffo cfce1a4a6c Fix spectral blocks being opaque (#716) 
Now you can see through the missing fluids

Also reduced the opacity slightly.
 2016-05-11 17:40:41 -07:00
Nicholas Ignoffo b2fb264108 Phantom Bridge sigil should now work while riding entities (#717) 
http://i.imgur.com/TnQRX6v.gifv
 2016-05-11 17:27:01 -07:00
Nicholas Ignoffo f3173c80a7 Fix Phantom Block rendering 2016-05-11 17:26:38 -07:00
Nicholas Ignoffo a37f3fad7b Beets should increase Tranquility (#737) 2016-05-11 16:44:52 -07:00
WayofTime 4486e03736 Merge branch '1.9' of https://github.com/WayofTime/BloodMagic into 1.9 2016-05-11 18:39:03 -04:00
WayofTime d26b300b7b Fixed Elytra upgrade not working on servers. Oops! 2016-05-11 18:38:38 -04:00
neconeco2 bb16279497 Update ja_JP.lang (#732) 2016-05-09 19:52:03 -04:00
Nicholas Ignoffo 3ce6735920 Allow Demonic Will to drop from passive mobs in Peaceful (#733) 
Goes along with b2d1b75f49 and #711
 2016-05-09 16:38:43 -07:00
Yulife 6cd78757bf Merge remote-tracking branch 'origin/1.9' into 1.9 
# Conflicts:

#	src/main/resources/assets/bloodmagic/textures/items/ExplosivePowder.png
#	src/main/resources/assets/bloodmagic/textures/items/PlantOil.png
#	src/main/resources/assets/bloodmagic/textures/items/Saltpeter.png
#	src/main/resources/assets/bloodmagic/textures/items/Sulfur.png
 2016-05-08 15:08:56 +02:00
Yulife 7fa03ad432 Alchemy items 💃 2016-05-08 15:07:00 +02:00
WayofTime 7434a253cf Merge pull request #726 from qianzha/patch-14 
Update zh_CN.lang
 2016-05-06 17:54:29 -04:00
WayofTime d79be6d312 Added saltpeter and sulfur, used for gunpowder creation and will be used for other things. 2016-05-06 17:51:39 -04:00
qianzha 000c8041af Update zh_CN.lang 2016-05-06 21:22:19 +08:00
qianzha 500a11a468 Update zh_CN.lang 2016-05-06 15:18:47 +08:00
qianzha be640bff95 Update zh_CN.lang 2016-05-06 14:54:40 +08:00
WayofTime ec2ddbd427 Added more alchemy recipes 2016-05-05 15:46:09 -04:00
WayofTime 03fa7b2712 Added plant oil and associated recipes - need to compile a list for future alchemy items 2016-05-05 07:59:08 -04:00
Yulife 050d1185a7 Cutting Fluid 2016-05-05 12:09:44 +02:00
Yulife dde4e6fbe2 Dusts 2016-05-05 11:55:51 +02:00
Yulife c9140669d4 Charging Rune 2016-05-05 11:51:17 +02:00
WayofTime e3b72c3b7e Made the Tough Skin effect easier to get, and increased the durability of living armour by 50%. 2016-05-04 19:32:32 -04:00
WayofTime 37cb2a1360 Added some more recipes (like rudimentary ore doubling) to the alchemy table 2016-05-04 19:25:42 -04:00
WayofTime 86efa8b1a3 Updated the Alchemy Table recipe system so that it can provide better custom recipes 2016-05-04 16:44:32 -04:00
WayofTime a5dee50984 Attempted to fix the CME in the routing. 2016-05-03 09:16:56 -04:00
WayofTime 7ce9040aeb Changed Blood Altar to be stone level for the pick. 2016-05-03 07:29:35 -04:00
WayofTime 25108a5838 Formatting pass. 2016-05-02 20:56:32 -04:00
WayofTime 1e9f3dadd3 Merge pull request #723 from lazerzes/1.9 
Fixed Issue #703; Blocks with MetaData being reset to 0
 2016-05-02 20:54:22 -04:00
lazerzes 3f5fd16f87 Fixed Issue #703; Blocks with MetaData being reset to 0 2016-05-02 20:45:38 -04:00
WayofTime c80b083865 More tweaks to the alchemy table, as well as some minor recipes. 2016-05-02 20:08:25 -04:00
WayofTime ce385bd9a6 Added JEI compat for the Alchemy Table 2016-05-02 13:45:52 -04:00
WayofTime f9fc33d1ee Finished work on ISided nature of the alchemy table 2016-05-02 11:45:11 -04:00
WayofTime a03bc4d9a9 Forgot files... 2016-05-02 11:24:34 -04:00
WayofTime c32ac20936 Work on alchemy table 2016-05-02 11:24:22 -04:00
WayofTime 7116e3775e Worked on the Alchemy Table - final push for -35 2016-05-02 08:27:38 -04:00
WayofTime bc7760b11b Removed bad code from Elytra upgrade. 2016-05-01 22:33:13 -04:00
WayofTime d3379ff69b Additional work on the Alchemy Table, as well as the Elytra upgrade. 2016-05-01 22:32:15 -04:00
Nicholas Ignoffo d10d6e6275 Comment out Waila compat until Waila updates mappings 2016-05-01 13:55:15 -07:00
WayofTime f754d14927 Elytra upgrade~ (Untested) 2016-05-01 15:10:32 -04:00
Nicholas Ignoffo 08f865ba8a Fix JEI support for orb recipes with more than 1 orb 2016-05-01 09:10:12 -07:00
Nicholas Ignoffo 8283047bf1 Re-implement Waila compat 2016-05-01 09:00:49 -07:00
Nicholas Ignoffo cfa40e9bfb Update JEI compat 
Supports new category item system.
Fixes Binding category input slot cycling through input and catalyst.
 2016-05-01 08:35:07 -07:00
WayofTime 41edd86602 Work on Elytra upgrade. 
Fixed Lava Crystals again
 2016-05-01 10:01:00 -04:00
WayofTime 08de13b482 Added fall distance mitigation to the jump upgrade 2016-04-30 10:39:50 -04:00
WayofTime aba4332699 Changed it so that the Mending enchantment consumes the EXP before the Tome of Peritia does 2016-04-29 19:55:23 -04:00
WayofTime 172cf86348 - Changed Living Armour so that it is now damagable. The Living Armour Chestplate will be damaged, but will not break. If it gets to ~0 durability, it will damage your LP network heavily. 
- Living Armour is now repairable in an anvil with Binding Reagent.
- Started adding in the Alchemy Table... not really started.
 2016-04-29 19:45:45 -04:00
Nicholas Ignoffo aacb54962b Remove Compression mod bandaid 
An actual fix was implemented by the author.
 2016-04-24 11:54:05 -07:00
Nicholas Ignoffo 4a1484965c Fix spam when registering potions 2016-04-24 11:52:58 -07:00
Nicholas Ignoffo d550513f0a Update Forge + mappings 2016-04-24 10:06:28 -07:00
Nicholas Ignoffo b408234ab0 Fix formatting in compression compat 2016-04-24 08:50:10 -07:00
Nicholas Ignoffo ba17fe126e Config for ignoring Compression mod's compress recipes 
Over 3200 recipes with *just* vanilla + BM is... bad. Nobody should be adding that many...
 2016-04-24 08:30:59 -07:00
WayofTime b9557bf5ae Merge pull request #719 from neconeco2/1.9-JP-patch01 
Create ja_JP.lang (v2.0.0-33)
 2016-04-24 07:08:40 -04:00
qianzha 57e949c99e Update zh_CN.lang 2016-04-24 18:36:58 +08:00
neconeco2 0cfa101e22 Update ja_JP.lang 
change 'Dusk' and 'Dawn' transrate
 2016-04-24 11:18:54 +09:00
neconeco2 95105db5e2 Create ja_JP.lang (v2.0.0-33) 2016-04-23 15:22:36 +09:00
Yulife 2293b91b98 Charging Rune 2016-04-22 21:33:52 +02:00
Yulife a6949f58bb Transposition Sigil and Sacrifice Armour 
Also removed some unused textures, @Tombenpotter what does each sigil
do?
 2016-04-19 17:50:14 +02:00
Nick 137beb4006 Add a clickable area to Soul Forge to view recipes 2016-04-18 19:23:47 -07:00
Yulife 472fe71a80 New ceremonial dagger texture 2016-04-18 15:43:20 +02:00
Yulife a34f7b9566 Goodbye transparent pixels 2016-04-18 15:43:20 +02:00
Nick 6449da0733 Use separate texture for activated sac dagger instead of enchant overlay 2016-04-17 14:03:26 -07:00
Nick a4f55d88b6 Change some int displays to Roman Numerals 
May not be 100% accurate if you somehow manage to get these really, really high, but it's good enough.
 2016-04-17 13:51:39 -07:00
Nick d71f181729 Add decoration safe tooltip to Blood Runes and Ritual Stones 2016-04-17 13:50:23 -07:00
Yulife 46aafe3368 New soul texture 
Thanks to @CyanideX for the base :D
 2016-04-17 22:45:39 +02:00
Nick 458f8810b6 Fix Sacrificial Runes not affect sacrifice amount (#713) 2016-04-17 00:03:53 -07:00
Yulife 8ddd95b294 Demon Tools 2016-04-16 15:52:50 +02:00
Nick b2d1b75f49 Allow passives to drop Will in Peaceful (#711) 2016-04-15 16:46:58 -07:00
WayofTime 0e4e428f0e Fixed NPE when re-activating a ritual. 2016-04-15 13:19:32 -04:00
WayofTime 33901910de Fixed another localization derp 2016-04-15 11:08:20 -04:00
WayofTime f770f5eb30 Finished localization of ritual descriptions (for now). 2016-04-15 10:59:22 -04:00
Yulife d00c272561 New router 2016-04-15 16:03:06 +02:00
Yulife 7ddafcf4d4 Ritual Tools 2016-04-15 15:46:48 +02:00
WayofTime 7ca72320c5 Initial work on Capabilities usage for inventories. 2016-04-13 17:58:06 -04:00
WayofTime 744feffc54 Added the recipe for the ritual tinkerer and modified the recipe for the bloodstone blocks. 2016-04-13 14:50:42 -04:00
WayofTime 049d7c8472 Fixed shift-clicking for the routing nodes 2016-04-13 11:46:28 -04:00
WayofTime c0b39039cc Fixed the Speed and Jump rituals so that they correctly update the player's motion 2016-04-13 11:05:17 -04:00
Nick Ignoffo 81e9452a21 Merge pull request #709 from Arcaratus/1.9 
Improved the API and internal workings
 2016-04-12 18:37:05 -07:00
Arcaratus 3e50dd4117 Improved the API and internal workings 
Update things

Fix some more things

Update once more

Refactoring and removing unnecessary null checks

Woops

Fix

Nother fix

Moar fix

Fix imports

Update ItemBindable.java
 2016-04-12 20:34:08 -04:00
WayofTime 8571d4d264 Potential fix for routing nodes (I changed nothing, but it now works). Fixed blocks that are solid that did not block sunlight. 2016-04-12 15:25:16 -04:00
WayofTime 0a2dfb4fd4 Finished more ritual stuff 2016-04-11 17:31:14 -04:00
WayofTime 91ddb8b761 A lot more implementation work for custom areas for rituals. 2016-04-11 15:36:27 -04:00
WayofTime 51c79f15a9 Added chest ranges to the rituals that have chests, allowing the location of the chest to be assigned by the player. 2016-04-11 09:57:57 -04:00
WayofTime 9fe525b74b Did more work on the Ritual Reader. Fixed issue with the Ritual Diviner cycling its direction when you right click on the MRS. 2016-04-11 08:26:41 -04:00
WayofTime 057a951732 Did more work on the Ritual Reader - functionally, it is at about 80%. 2016-04-10 22:09:32 -04:00
WayofTime 30f233b81a Untested Ritual Reader stuff, and removing some registry shenanigans. 2016-04-10 21:19:18 -04:00
WayofTime db268b23a4 Started work on the "Ritual Reader," which will in the future give more information about rituals as well as allow you to set the custom areas of the rituals. 2016-04-10 15:05:51 -04:00
Nick f88dae6dda Add setRegistryName calls where missing 
Also fixed Teleposition Sigil having Teleposition Focus's name. Stupid auto-complete not knowing which "TELEP" I wanted.
 2016-04-09 17:06:41 -07:00
Nick d48e4e5ae8 Move setRegistryName out of item/block constructors 2016-04-09 16:50:16 -07:00
WayofTime b259afc7df Updated changelog, changed Sacrificial Dagger's call to protected 2016-04-09 17:59:25 -04:00
WayofTime 8b4a7d4999 Did some work on the Sentient Bow to start adding abilities to it 2016-04-09 17:57:30 -04:00
WayofTime 9768909eb8 Fixed it so the sentient bow actually shoots sentient arrows. 2016-04-09 15:35:02 -04:00
WayofTime 0b38f16672 Attempted to do a bit of rebalancing with the upgrade points 2016-04-07 21:11:25 -04:00
WayofTime 21473c12cd Added True Strike, increasing the damage of critical hits 2016-04-07 16:27:34 -04:00
WayofTime 7b94e414f8 Added Charging Strike armour upgrade 2016-04-07 15:12:57 -04:00
WayofTime bd36e95fc9 Reworked damage-modifying upgrades 2016-04-07 14:22:45 -04:00
WayofTime aa6d7bcfaa WTP, SourceTree? 2016-04-07 14:05:36 -04:00
WayofTime 2c72a27f8f Added step assist living armour upgrade tracker 2016-04-07 14:00:18 -04:00
WayofTime 832371271a Added recipe for the Tome of Peritia 2016-04-07 10:44:20 -04:00
WayofTime c3922fad63 Rebalanced Grave Digger so that it takes into account the swing cooldown 2016-04-07 10:35:00 -04:00
WayofTime 7d9312b2f8 Reverted changes to Living Armour - waiting on change to Forge's armour to balance properly. 2016-04-07 10:07:55 -04:00
WayofTime aa480af518 Updated forge, did random stuff to the armour before realizing issues with armour calculations 2016-04-06 21:04:50 -04:00
WayofTime b56bbef29e Formatting! 2016-04-05 16:16:17 -04:00
WayofTime 029091852d Fixed Water and Lava sigils placing two sources in special scenarios. 2016-04-05 16:13:49 -04:00
Nick 794ac6a7a2 Move binding back to PIE 
BM will now only load with Forge 1840+ as that is the version that PIE was re-implemented. Set dependency to avoid crashes. Also updated JEI version so it wouldn't crash with new Forge.
 2016-04-04 19:23:06 -07:00
WayofTime b0b61798fe Added "Grave Digger" living armour upgrade 2016-04-04 20:18:10 -04:00
WayofTime 1c6c7ba0a6 Fixed some minor bugs with the Living Armour 2016-04-04 19:24:43 -04:00
WayofTime 0755202a35 Fixed custom potion effects so they could be applied server-sided 2016-04-04 13:35:10 -04:00
WayofTime fa6c57091b Fixed an issue with the sentient sword having an attack speed of 4 when it did not make a will bracket. 2016-04-03 21:59:47 -04:00
WayofTime 6630e50efd Fixed the Sentient Sword so that it would use the default will type if it didn't have enough will. 2016-04-03 21:46:23 -04:00
WayofTime 02adac819d Fixed OutOfBoundsException in the Sentient Sword when you didn't have enough Will 2016-04-03 19:19:45 -04:00
WayofTime 912f1694e8 Added increase in speed for Routing nodes inside of a chunk with Demon Aura 2016-04-03 17:08:00 -04:00
WayofTime 25bfa0c969 Fixed armour calculations for unblockable sources 2016-04-03 13:44:47 -04:00
WayofTime 0afc150cc3 Rebalanced soft fall upgrade poings 2016-04-03 12:19:52 -04:00
WayofTime 96ecd73286 Added Soft Fall and Strong Legs living armour upgrades. 2016-04-03 12:17:42 -04:00
WayofTime f9bf63ccf1 Fixed NPE when using an empty bucket 2016-04-03 10:12:10 -04:00
WayofTime ad97710dda Implemented texture for the Experience Book 2016-04-03 09:03:27 -04:00