Commit graph

334 commits

Author SHA1 Message Date
Nick
437dc1b96e Tweaks to damage. It now uses the DamageSource correctly 2015-12-01 23:35:09 -08:00
Nick
26e3888004 Remove reference to sun.misc.Launcher 2015-12-01 21:59:07 -08:00
Nick
b97f7d81c4 Docs for NetworkHelper 2015-12-01 21:55:56 -08:00
Nick
c4e6f63ada Cleanup javadoc and make it compile correctly 2015-12-01 21:14:26 -08:00
Nick
3200683b74 Wrong Nullable import 2015-11-29 17:38:15 -08:00
Arcaratus
225016e030 Finished the Altar 2015-11-29 19:04:50 -05:00
Nick
91f88b846f Add support for JustEnoughItems
Will build on as we add more recipe types.
2015-11-28 23:52:06 -08:00
Nick
34dee6447b A whole lot of formatting cleanup
Also changes NBTHolder to a standard Constants class with subclasses for each category
2015-11-28 18:25:46 -08:00
Arcaratus
08e7844df1 Merge branch '1.8-Rewrite' of https://github.com/WayofTime/BloodMagic into 1.8-Rewrite 2015-11-27 20:15:47 -05:00
Arcaratus
a6d329cf98 Altar works 2015-11-27 20:15:19 -05:00
Nick
e0b073b8b7 Cleanup the SoulNetwork a bit.
Should work now?
2015-11-22 13:43:15 -08:00
Nick
9035f800e2 Easier handling of meta blocks 2015-11-17 15:52:31 -08:00
Nick
9a6d8d6d60 Blood Letter's Pack + Coat of Arms 2015-11-11 10:45:46 -08:00
Arcaratus
86fcd4808b Finished Water, Lava, and Void sigils
Also added in bloodstone
2015-11-07 21:37:12 -05:00
Nick Ignoffo
5ec35fcd08 Merge pull request #494 from Arcaratus/1.8-Rewrite
Sacrificial commit
2015-11-07 09:09:42 -08:00
Nick
e9cbcd4bfb Merge remote-tracking branch 'origin/1.8-Rewrite' into 1.8-Rewrite 2015-11-07 09:08:02 -08:00
Arcaratus
806f291d02 Fix spelling of 'incense' 2015-11-07 11:54:36 -05:00
Arcaratus
2fc34a5138 Sacrificial Commit 2015-11-07 11:51:41 -05:00
WayofTime
bf912ae03f Created the BlockRitualStone and had it implement IRitualStone. Created .json files necessary
Created PropertyRuneType.
2015-11-06 21:41:15 -05:00
Nick
6fc22c170e Lombokify 2015-11-03 10:44:08 -08:00
Nick
798d4b926c Use a wrapper instead of ItemStacks for Altar recipes 2015-11-03 10:00:40 -08:00
Nick
e12c78877e Fix recipe by stack lookup 2015-11-03 09:47:38 -08:00
Nick
fa1bb906d3 Cleanup 2015-11-03 08:09:16 -08:00
Nick Ignoffo
081698c6f9 Merge pull request #490 from Arcaratus/1.8-Rewrite
Finished the Altar
2015-11-03 07:35:50 -08:00
Nick
68fae8c321 Fix Ritual Registry crashing with more than one registered.. 2015-11-03 07:35:14 -08:00
Arcaratus
ab60e5f3fe Finished the Altar 2015-11-03 10:34:11 -05:00
Nick
ac5402df6b Cleanup
Renders for Runes
Creative crystal renders
Formatting
Lang additions
Some attempted (not successful) fixes for SoulNetwork
2015-11-02 19:18:53 -08:00
Arcaratus
4734f1207a Merge branch '1.8-Rewrite' of https://github.com/WayofTime/BloodMagic into 1.8-Rewrite
Conflicts:
	src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java
2015-11-02 21:35:23 -05:00
Arcaratus
75143520ed Pre-emptive things 2015-11-02 21:30:28 -05:00
Nick
d285736ca9 Imperfect ritual system hopefully works correctly now 2015-11-02 18:00:48 -08:00
Nick
92bf7cc35b Imperfect rituals work mostly now
Just need to figure out an issue with the config
2015-11-02 17:45:11 -08:00
Nick
b59bc9766e Fix BlockRitualController's ItemBlock name 2015-11-02 15:55:17 -08:00
Nick
1d52cb5e67 Remove Unnecessary methods from RitualHelper
Activation, updates, and stopping should all be handled within the tiles.
2015-11-02 12:49:53 -08:00
Nick
096ba02450 Refactor everything to WayofTime.bloodmagic.* 2015-11-02 12:39:47 -08:00