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

1458 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
WayofTime 7bf8fb82c3 Fixed changelog because TehNut is a meanie pants. 2016-04-24 11:49:06 -04:00
WayofTime fbd7b751fc Updated changelog for the -34 update. 2016-04-24 11:48:06 -04: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
WayofTime 9ba616d260 Merge pull request #720 from qianzha/patch-13 
Update zh_CN.lang
 2016-04-24 07:08:30 -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