Commit graph

589 commits

Author SHA1 Message Date
neconeco2
bb16279497 Update ja_JP.lang (#732) 2016-05-09 19:52:03 -04: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
37cb2a1360 Added some more recipes (like rudimentary ore doubling) to the alchemy table 2016-05-04 19:25:42 -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
7116e3775e Worked on the Alchemy Table - final push for -35 2016-05-02 08:27:38 -04:00
WayofTime
d3379ff69b Additional work on the Alchemy Table, as well as the Elytra upgrade. 2016-05-01 22:32:15 -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
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
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
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
Yulife
8ddd95b294 Demon Tools 2016-04-16 15:52:50 +02: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
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
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
b0b61798fe Added "Grave Digger" living armour upgrade 2016-04-04 20:18:10 -04:00
WayofTime
96ecd73286 Added Soft Fall and Strong Legs living armour upgrades. 2016-04-03 12:17:42 -04:00
WayofTime
ad97710dda Implemented texture for the Experience Book 2016-04-03 09:03:27 -04:00
Yulife
73a3f4800a Texture for Experience Book 2016-04-03 15:00:48 +02:00