Commit graph

698 commits

Author SHA1 Message Date
Nick 6f96e200d2 Update to 1.8.8. It's stable enough, now 2015-11-28 23:51:41 -08:00
Nick df78138244 Don't build a deobf jar when building
They are deprecated with ForgeGradle 2.0+. Authors should use deobfCompile in their dependencies block instead.
2015-11-28 18:27:24 -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
Nick Ignoffo f9802900db Merge pull request #503 from Arcaratus/1.8-Rewrite
Finished the Altar
2015-11-28 17:47:12 -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 a12c72092a TileAltar now uses new SN methods 2015-11-22 14:02:56 -08:00
Nick e0b073b8b7 Cleanup the SoulNetwork a bit.
Should work now?
2015-11-22 13:43:15 -08:00
Nick 352c6b9e5f Remove the untested caps
They NPE :D
2015-11-21 10:36:02 -08:00
Nick 066d3a3f1b Temporarily cap to 16 per meta
Will work on implementing automatic overflow handling (Creating a new block when all the meta is taken up)
2015-11-17 16:30:08 -08:00
Nick 9035f800e2 Easier handling of meta blocks 2015-11-17 15:52:31 -08:00
Nick fb94914b91 Abstract altar inventory handling for usage elsewhere 2015-11-12 13:05:23 -08:00
Nick 9a6d8d6d60 Blood Letter's Pack + Coat of Arms 2015-11-11 10:45:46 -08:00
Nick 4b7ad55016 Fix TileAltar NBT saving
@Arcaratus, why did you rmove that?
2015-11-11 10:35:44 -08:00
WayofTime 94fbedd39e Created ItemLivingArmour as a replacement for the Bound armour. Initial implementation completed. 2015-11-08 17:42:02 -05:00
Nick Ignoffo 12e764e5be Merge pull request #495 from Arcaratus/1.8-Rewrite
Finished Water, Lava, and Void sigils
2015-11-07 18:48:48 -08:00
Arcaratus 258e9a1108 Remove unnecessary ISigil implements 2015-11-07 21:45:03 -05:00
Arcaratus 0788bbd3b2 Remove unnecessary ISigil implements 2015-11-07 21:44:44 -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
Nick 441282e004 Add Contributing section to README 2015-11-07 09:06:47 -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
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 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 ddcc1237e8 Inventories now don't NPE when broken 2015-11-03 09:11:39 -08:00
Nick 6a5f5356ce Fix inventory tiles not saving inventory 2015-11-03 08:42:38 -08:00
Nick bd564ee7cf Should fix altar crashing 2015-11-03 08:31:34 -08:00
Nick b1e8930c11 Rain imperfect ritual 2015-11-03 08:15:24 -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 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
Nick Ignoffo ac588d0b15 Merge pull request #489 from Arcaratus/1.8-Rewrite
I'm tired and going to sleep
2015-11-02 18:39:26 -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 3a0dcae59a Fix startup possible crash issues
how did i never notice this?
2015-11-02 17:24:43 -08:00
Nick b59bc9766e Fix BlockRitualController's ItemBlock name 2015-11-02 15:55:17 -08:00
Nick c10c0455be Merge remote-tracking branch 'origin/1.8-Rewrite' into 1.8-Rewrite 2015-11-02 15:28:52 -08:00
Nick 72041e936a Altar renders now 2015-11-02 15:28:33 -08:00