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

604 commits

Author SHA1 Message Date
WayofTime
424d84d5ad Added a test entry for the Demon Kin 2016-06-04 15:01:25 -04:00
Nicholas Ignoffo
d0c0700fda Un-hardcode block documentation 
Opens it up for all our custom blocks to be able to provide information.

Need a texture from @Yulife.
 2016-06-02 17:03:21 -07:00
WayofTime
cf72036ff9 Added an initial (read: rough) method to divine where a blood rune is missing for the next tier of altar 2016-06-02 19:09:02 -04: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
Yulife
6e1383c6e0 Upgrade Trainer and Sheathed Tool 2016-05-30 13:49:43 +02: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
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
WayofTime
328b566064 Guesstimated the localization of the Fluid for Life Essence 2016-05-12 10:50:07 -04: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
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