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

698 commits

This branch
This branch
All branches
Author SHA1 Message Date
WayofTime f18d824c05 Updated .gitignore due to eclipse launch files in directory. 2015-11-02 16:53:54 -05:00
Nick 5985be1cd0 Fix RitualController not rendering 2015-11-02 13:20:29 -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
Nick 46742a73d1 Ritual work + Begin move of NetworkHelper (static) to SoulNetwork (instance) 2015-11-02 09:51:11 -08:00
Nick afad5b0fd0 Some more ritual work + imperfect rituals 2015-10-31 17:58:47 -07:00
Nick 3a7e0a3a8c Begin rituals + some refactoring 2015-10-31 13:47:43 -07:00
Nick 07b1f36594 Okay... They render now... 2015-10-30 22:07:06 -07:00
Nick b45172294d JSON models hurt my head 2015-10-30 21:20:23 -07:00
Nick f3645a35fa Forgot credits + change deletion ID 2015-10-30 17:02:10 -07:00
Nick 2bf78bc61c Divination Sigil no longer spams chat 2015-10-30 16:54:59 -07:00
Nick 09ff96fe03 Life Essence 2015-10-29 22:22:08 -07:00
Nick cb3412bc84 Forgot this for Divination Sigil 2015-10-29 22:06:43 -07:00
Nick 61365dc80f Use abstracted ModelLoader method in Orb Registry + Stop Orb JSON spam 2015-10-29 22:06:18 -07:00
Nick ce5e529135 Move old blockstates to old folder 2015-10-29 22:05:48 -07:00
Nick 77ccc3a727 Divination Sigil 2015-10-29 22:05:00 -07:00
Nick Ignoffo c701848011 Update README.md 2015-10-29 20:33:40 -07:00
Nick e3d4afa123 Rewrite is Go! 
Just moving over all my changes from my fork
 2015-10-29 20:22:16 -07:00
WayofTime 8bdd1f8b8f Merge pull request #431 from Arcaratus/bloodmagic1.8 
JSON and the Arghhhh-onauts
 2015-08-24 17:34:00 -04:00
Arcaratus d15c4f2c8e JSON and the Arghhhh-onauts 2015-08-24 17:27:49 -04:00
WayofTime 23bb71de31 Oops! 2015-08-21 16:50:57 -04:00
WayofTime 3994bbd842 Remove test stuff 2015-08-21 16:31:04 -04:00
WayofTime 9658ce06f7 A lot more .json files (4) 2015-08-17 20:16:39 -04:00
WayofTime 93d5f4ad83 Texturez (3) 2015-08-12 17:24:45 -04:00
WayofTime 010f9ec49c Moar .jsons (wow, that's a lot...) (2) 2015-08-12 14:41:01 -04:00
WayofTime 8006c87e06 Slowly adding the .jsons (1) 2015-08-12 14:20:17 -04:00
WayofTime 0aab0e6fc0 Merge pull request #416 from TehNut/patch-1 
Create a utility for registering renders for Blocks/Items
 2015-08-03 22:00:21 -04:00
Nick Ignoffo e8cd503854 Create a utility for registering renders for Blocks/Items 
Almost direct copypasta from [my project](https://github.com/TehNut/ResourcefulCrops/blob/1.8/src/main/java/tehnut/resourceful/crops/util/helper/RenderHelper.java). Allows you to simply register models for Items/Blocks for given Metadata's.

Call these from your ClientProxy in postInit. A working example can be seen [here](https://github.com/TehNut/ResourcefulCrops/blob/1.8/src/main/java/tehnut/resourceful/crops/proxy/ClientProxy.java#L21-L25) [[Items](https://github.com/TehNut/ResourcefulCrops/blob/1.8/src/main/java/tehnut/resourceful/crops/registry/ItemRegistry.java#L42-L52)] [[Blocks](https://github.com/TehNut/ResourcefulCrops/blob/1.8/src/main/java/tehnut/resourceful/crops/registry/BlockRegistry.java#L30-L34)].

Review this a bit more closely. I did it from the web editor and it may not have worked 100% correctly.
 2015-08-02 01:41:36 -05:00
WayofTime b005d80ebd Fixed the model for the blood altar (by basically disabling it for now) 2015-07-31 20:42:17 -04:00
WayofTime 53eb3a16b0 Test commit 2015-07-31 17:21:08 -04:00
WayofTime 6b0507931e Merge pull request #413 from Arcaratus/bloodmagic1.8 
Fixed Things
 2015-07-31 12:13:39 -04:00
Arcaratus 556d747825 Merge branch 'bloodmagic1.8' of https://github.com/WayofTime/BloodMagic into bloodmagic1.8 2015-07-31 12:12:19 -04:00
Arcaratus 786cda06c2 Fixed 2015-07-31 12:11:44 -04:00
WayofTime a70bb5c11e TEBelljar 2015-07-31 11:48:52 -04:00
WayofTime b4d5f85e4e Revert "Re-refixed TEBelljar" 
This reverts commit e242207d50.
 2015-07-31 11:46:05 -04:00
WayofTime e242207d50 Re-refixed TEBelljar 2015-07-31 11:45:50 -04:00
WayofTime 91ad8debe2 Merge pull request #412 from Arcaratus/bloodmagic1.8 
Finished all porting
 2015-07-31 11:42:07 -04:00
Arcaratus d528bdbbf8 Finished all porting 2015-07-31 11:35:05 -04:00
WayofTime 1bd90ff01c Fixed TEBellJar calls (may need to be changed back again...) 2015-07-30 20:50:48 -04:00
WayofTime b5d9e3ee58 Merge pull request #410 from Arcaratus/bloodmagic1.8 
All items !sigils
 2015-07-30 20:49:27 -04:00
Arcaratus 93e5e6cca6 Merge branch 'bloodmagic1.8' of https://github.com/WayofTime/BloodMagic into bloodmagic1.8 2015-07-30 17:29:08 -04:00
Arcaratus faa22ae8aa Merge branch 'bloodmagic1.8' of https://github.com/WayofTime/BloodMagic into bloodmagic1.8 2015-07-30 17:24:49 -04:00
WayofTime f009d58f74 Fixes 2015-07-30 17:24:46 -04:00
Arcaratus a2c4f4b965 All the items !sigils 2015-07-30 17:24:20 -04:00
WayofTime 8fcbc53983 Merge pull request #409 from Arcaratus/bloodmagic1.8 
Finished (almost) everything !items
 2015-07-30 16:32:51 -04:00
Arcaratus d88cc2d79e Finished ModItems 2015-07-30 15:53:50 -04:00
Arcaratus a9507b3b68 Finished (almost) everything !items 2015-07-30 14:52:39 -04:00
WayofTime 8eed901fcb Merge pull request #408 from Arcaratus/bloodmagic1.8 
Finished TileEntities
 2015-07-30 11:00:44 -04:00
Arcaratus 2472cad9f1 Merge branch 'bloodmagic1.8' of https://github.com/WayofTime/BloodMagic into bloodmagic1.8 2015-07-30 10:24:44 -04:00
Arcaratus b2f7ec6030 Finished TileEntities 2015-07-30 10:21:53 -04:00