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 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
WayofTime 1fbebc56a2 Merge pull request #404 from Arcaratus/bloodmagic1.8 
Did ModBlocks
 2015-07-29 11:34:46 -04:00
Arcaratus e5abfd03e5 Did ModBlocks 2015-07-29 11:30:24 -04:00
WayofTime f046b07a82 Reworked more rituals, allowed Int3 to be created from BlockPos - note for future, may replace Int3 with Vec3i for future use 2015-07-29 11:25:11 -04:00
WayofTime 14d603e99c Merge pull request #403 from Arcaratus/bloodmagic1.8 
I hope this works
 2015-07-29 09:32:44 -04:00
Arcaratus 45e8c57ac9 Hope this works 2015-07-29 09:27:45 -04:00
Arcaratus 3578a431e8 Added CB Files 2015-07-29 09:20:39 -04:00
WayofTime b090d154eb Doing more cleanup 2015-07-29 09:15:43 -04:00
WayofTime 59b8ecc271 Fixed more issues 2015-07-29 09:08:46 -04:00
WayofTime e9562e37cb Started to continue the long process of fixing all the errors. 2015-07-29 08:59:13 -04:00
WayofTime e812118b2e Merge branch 'bloodmagic1.8' of https://github.com/WayofTime/BloodMagic 2015-07-29 08:27:38 -04:00
WayofTime c5681dc831 Initial commit of BM 1.8 2015-07-29 08:23:01 -04:00
WayofTime d99eadbea7 Test Commit 2015-07-29 07:44:03 -04:00
WayofTime e5536872a9 Mild code cleanup after having to reclone the dev environment. 2015-07-29 07:34:41 -04:00
WayofTime f85a9471dd Merge pull request #402 from Arcaratus/master 
Performance Commit 2
 2015-07-28 14:18:47 -04:00
Arcaratus c447106cb1 Performance Commit 2 2015-07-28 13:49:26 -04:00
Arcaratus 603db8ee2a Merge branch 'master' of https://github.com/WayofTime/BloodMagic 2015-07-28 13:03:57 -04:00
Arcaratus acfc78187f Added in the Demon Spawn achievement 2015-07-28 13:03:47 -04:00
WayofTime 647f81e624 Merge pull request #399 from Arcaratus/master 
Added in #396 and sword blocking
 2015-07-27 14:07:22 -04:00
Arcaratus f20d99628b Merge branch 'master' of https://github.com/WayofTime/BloodMagic 2015-07-27 14:02:44 -04:00
Arcaratus bc67bb8379 Added in #396 and gave the sword blocking 2015-07-27 14:02:32 -04:00
WayofTime 6470d91ff9 Fix #398, Fixed DemonPlacer so that it would spawn the demons with the owners. 2015-07-27 13:36:47 -04:00
Arcaratus e2db60475f Merge branch 'master' of https://github.com/WayofTime/BloodMagic 2015-07-27 11:52:27 -04:00
WayofTime 79f86a3a37 Fixed the Dynamic Mace so that it looks at the material of the block as well. 2015-07-23 09:23:38 -04:00
WayofTime b2c013e8c6 Disabled arm rendering for 1.3.3-11 2015-07-20 20:56:46 -04:00
WayofTime 87d8af95d7 Merge pull request #393 from Arcaratus/master 
Fix Entities
 2015-07-20 19:57:47 -04:00
Arcaratus 1ed939b700 Merge branch 'master' of https://github.com/WayofTime/BloodMagic 2015-07-20 19:56:39 -04:00
Arcaratus 06df5f5e39 Fix Entities 2015-07-20 19:56:29 -04:00
WayofTime 8d7d587e01 Arm now renders over all layers. 2015-07-19 21:07:45 -04:00
WayofTime 724f09c130 More arm stuffs! 2015-07-19 19:06:22 -04:00
WayofTime 32e6539deb More attempts at the armour rendering, and an attempt to fix the entities. 2015-07-19 17:01:18 -04:00
WayofTime 43c1386c78 Merge pull request #391 from qianzha/patch-10 
Update zh_CN.lang (v1.3.3-4)
 2015-07-19 16:17:58 -04:00
WayofTime 19ed528d13 Experimentation with rendering the armour of the player. 2015-07-19 14:44:12 -04:00
qianzha e953f9e3eb Update zh_CN.lang (v1.3.3-4) 2015-07-19 20:43:20 +08:00