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

631 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
WayofTime d0b15c29de Made the Toggleable sigil to make it easier for toggle sigils. Will replace the NBT editing in the sigils. 2015-07-30 10:16:16 -04:00
WayofTime 230b44fe88 Finished all errors except for the sigils. 2015-07-30 09:31:16 -04:00
WayofTime 9e2c0e6e74 Fixed non-armour and non-sigil items 2015-07-30 08:44:01 -04:00
WayofTime 8241c3cbd1 Added the .jsons for the base runes and added the BlockStates to it. 2015-07-29 22:07:13 -04:00
WayofTime aed8436204 Deleted unused resources, added a test .json for the armour forge. 2015-07-29 21:45:19 -04:00
WayofTime b14f2898e8 Fixed Block item renderers 2015-07-29 18:34:15 -04:00
WayofTime b406b581a0 Temporarily removed Pam harvest handlers. 2015-07-29 18:17:50 -04:00
WayofTime 94b74fe309 Randoms. 2015-07-29 18:15:25 -04:00
WayofTime 800bf06872 Finished the old TESR's of the custom rendered blocks, will transition to .jsons when convenient. 2015-07-29 17:37:08 -04:00
WayofTime 977b6ce29d Finished fixing the raw Tile altar, and finished the Omega structure. 2015-07-29 15:04:00 -04:00
WayofTime cd5a52c7fb Merge pull request #406 from Arcaratus/bloodmagic1.8 
Add BlockRender code
 2015-07-29 14:47:12 -04:00
WayofTime dd07defe1f Quick render stuff 2015-07-29 14:46:53 -04:00
Arcaratus cfed9f5ab3 Add BlockRender code 2015-07-29 14:44:14 -04:00
WayofTime ffd5a672cb Merge pull request #405 from Arcaratus/bloodmagic1.8 
Finished all Blocks
 2015-07-29 14:38:47 -04:00
WayofTime 1aa343624e Finished the rituals 2015-07-29 14:37:45 -04:00
Arcaratus 419f532502 Finished all Blocks 2015-07-29 14:35:00 -04:00
WayofTime 86b753d098 Finished almost all rituals. 2015-07-29 14:26:37 -04:00