Commit graph

183 commits

Author SHA1 Message Date
Nick cce3d6b79a Simpler way of obtaining items via API 2015-12-23 09:42:52 -08:00
WayofTime f1a3c5ee46 Fixed Orb filling and added the Weak Blood Orb as a fillable orb. 2015-12-22 21:03:00 -05:00
Nick 13d9cb4b5a Add registry for Binding rituals and add JEI support 2015-12-02 19:27:28 -08:00
Nick 42d6c4b59b Whoops, forgot EtherealSlates 2015-12-02 16:28:07 -08:00
Nick 72d4c5e135 Config for ICompatibility 2015-12-02 13:28:50 -08:00
Nick 349efbd510 Move PotionArray size to Constants 2015-12-02 01:43:51 -08:00
Nick 7dd170e5ad Inscription Tools and Slates 2015-12-02 00:55:32 -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 cbd4f8c75f First pass on Pedestal/Plinth
I just want this out of my uncommitted file list...
2015-11-22 14:03:51 -08:00
Nick 9a6d8d6d60 Blood Letter's Pack + Coat of Arms 2015-11-11 10:45:46 -08:00
WayofTime 94fbedd39e Created ItemLivingArmour as a replacement for the Bound armour. Initial implementation completed. 2015-11-08 17:42:02 -05: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 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
WayofTime 8f623de469 Created test block which is coupled to the Default Spell Modifier .json model. The model has three submodels: the core, the output, and the input. 2015-11-06 17:26:38 -05:00
Nick b419e9aae9 The last of the Imperfect Rituals + Tile handles lightning 2015-11-05 19:58:43 -08:00
Nick b1e8930c11 Rain imperfect ritual 2015-11-03 08:15:24 -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
Arcaratus ab60e5f3fe Finished the Altar 2015-11-03 10:34:11 -05:00
Nick ed515f5c80 Air Sigil 2015-11-02 19:57:48 -08: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 096ba02450 Refactor everything to WayofTime.bloodmagic.* 2015-11-02 12:39:47 -08:00