lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Commit graph

  • b5d9e3ee58 Merge pull request #410 from Arcaratus/bloodmagic1.8 WayofTime 2015-07-30 20:49:27 -0400
  • 93e5e6cca6 Merge branch 'bloodmagic1.8' of https://github.com/WayofTime/BloodMagic into bloodmagic1.8 Arcaratus 2015-07-30 17:29:08 -0400
  • faa22ae8aa Merge branch 'bloodmagic1.8' of https://github.com/WayofTime/BloodMagic into bloodmagic1.8 Arcaratus 2015-07-30 17:24:49 -0400
  • f009d58f74 Fixes WayofTime 2015-07-30 17:24:46 -0400
  • a2c4f4b965 All the items !sigils Arcaratus 2015-07-30 17:24:20 -0400
  • 8fcbc53983 Merge pull request #409 from Arcaratus/bloodmagic1.8 WayofTime 2015-07-30 16:32:51 -0400
  • d88cc2d79e Finished ModItems Arcaratus 2015-07-30 15:53:50 -0400
  • a9507b3b68 Finished (almost) everything !items Arcaratus 2015-07-30 14:52:39 -0400
  • 8eed901fcb Merge pull request #408 from Arcaratus/bloodmagic1.8 WayofTime 2015-07-30 11:00:44 -0400
  • 2472cad9f1 Merge branch 'bloodmagic1.8' of https://github.com/WayofTime/BloodMagic into bloodmagic1.8 Arcaratus 2015-07-30 10:24:44 -0400
  • b2f7ec6030 Finished TileEntities Arcaratus 2015-07-30 10:21:53 -0400
  • d0b15c29de Made the Toggleable sigil to make it easier for toggle sigils. Will replace the NBT editing in the sigils. WayofTime 2015-07-30 10:16:16 -0400
  • 230b44fe88 Finished all errors except for the sigils. WayofTime 2015-07-30 09:31:16 -0400
  • 9e2c0e6e74 Fixed non-armour and non-sigil items WayofTime 2015-07-30 08:44:01 -0400
  • 8241c3cbd1 Added the .jsons for the base runes and added the BlockStates to it. WayofTime 2015-07-29 22:07:13 -0400
  • aed8436204 Deleted unused resources, added a test .json for the armour forge. WayofTime 2015-07-29 21:45:19 -0400
  • b14f2898e8 Fixed Block item renderers WayofTime 2015-07-29 18:34:15 -0400
  • b406b581a0 Temporarily removed Pam harvest handlers. WayofTime 2015-07-29 18:17:50 -0400
  • 94b74fe309 Randoms. WayofTime 2015-07-29 18:15:25 -0400
  • 800bf06872 Finished the old TESR's of the custom rendered blocks, will transition to .jsons when convenient. WayofTime 2015-07-29 17:37:08 -0400
  • 977b6ce29d Finished fixing the raw Tile altar, and finished the Omega structure. WayofTime 2015-07-29 15:04:00 -0400
  • cd5a52c7fb Merge pull request #406 from Arcaratus/bloodmagic1.8 WayofTime 2015-07-29 14:47:12 -0400
  • dd07defe1f Quick render stuff WayofTime 2015-07-29 14:46:53 -0400
  • cfed9f5ab3 Add BlockRender code Arcaratus 2015-07-29 14:44:14 -0400
  • ffd5a672cb Merge pull request #405 from Arcaratus/bloodmagic1.8 WayofTime 2015-07-29 14:38:47 -0400
  • 1aa343624e Finished the rituals WayofTime 2015-07-29 14:37:45 -0400
  • 419f532502 Finished all Blocks Arcaratus 2015-07-29 14:35:00 -0400
  • 86b753d098 Finished almost all rituals. WayofTime 2015-07-29 14:26:37 -0400
  • 1fbebc56a2 Merge pull request #404 from Arcaratus/bloodmagic1.8 WayofTime 2015-07-29 11:34:46 -0400
  • e5abfd03e5 Did ModBlocks Arcaratus 2015-07-29 11:30:24 -0400
  • f046b07a82 Reworked more rituals, allowed Int3 to be created from BlockPos - note for future, may replace Int3 with Vec3i for future use WayofTime 2015-07-29 11:25:11 -0400
  • 14d603e99c Merge pull request #403 from Arcaratus/bloodmagic1.8 WayofTime 2015-07-29 09:32:44 -0400
  • 45e8c57ac9 Hope this works Arcaratus 2015-07-29 09:27:45 -0400
  • 3578a431e8 Added CB Files Arcaratus 2015-07-29 09:20:39 -0400
  • b090d154eb Doing more cleanup WayofTime 2015-07-29 09:15:43 -0400
  • 59b8ecc271 Fixed more issues WayofTime 2015-07-29 09:08:46 -0400
  • e9562e37cb Started to continue the long process of fixing all the errors. WayofTime 2015-07-29 08:59:13 -0400
  • e812118b2e Merge branch 'bloodmagic1.8' of https://github.com/WayofTime/BloodMagic WayofTime 2015-07-29 08:27:38 -0400
  • c5681dc831 Initial commit of BM 1.8 WayofTime 2015-07-29 08:23:01 -0400
  • d99eadbea7 Test Commit WayofTime 2015-07-29 07:44:03 -0400
  • e5536872a9 Mild code cleanup after having to reclone the dev environment. WayofTime 2015-07-29 07:34:41 -0400
  • f85a9471dd Merge pull request #402 from Arcaratus/master WayofTime 2015-07-28 14:18:47 -0400
  • c447106cb1 Performance Commit 2 Arcaratus 2015-07-28 13:49:26 -0400
  • 603db8ee2a Merge branch 'master' of https://github.com/WayofTime/BloodMagic Arcaratus 2015-07-28 13:03:57 -0400
  • acfc78187f Added in the Demon Spawn achievement Arcaratus 2015-07-28 13:03:47 -0400
  • 647f81e624 Merge pull request #399 from Arcaratus/master WayofTime 2015-07-27 14:07:22 -0400
  • f20d99628b Merge branch 'master' of https://github.com/WayofTime/BloodMagic Arcaratus 2015-07-27 14:02:44 -0400
  • bc67bb8379 Added in #396 and gave the sword blocking Arcaratus 2015-07-27 14:02:32 -0400
  • 6470d91ff9 Fix #398, Fixed DemonPlacer so that it would spawn the demons with the owners. WayofTime 2015-07-27 13:36:47 -0400
  • e2db60475f Merge branch 'master' of https://github.com/WayofTime/BloodMagic Arcaratus 2015-07-27 11:52:27 -0400
  • 79f86a3a37 Fixed the Dynamic Mace so that it looks at the material of the block as well. WayofTime 2015-07-23 09:23:38 -0400
  • b2c013e8c6 Disabled arm rendering for 1.3.3-11 WayofTime 2015-07-20 20:56:46 -0400
  • 87d8af95d7 Merge pull request #393 from Arcaratus/master WayofTime 2015-07-20 19:57:47 -0400
  • 1ed939b700 Merge branch 'master' of https://github.com/WayofTime/BloodMagic Arcaratus 2015-07-20 19:56:39 -0400
  • 06df5f5e39 Fix Entities Arcaratus 2015-07-20 19:56:29 -0400
  • 8d7d587e01 Arm now renders over all layers. WayofTime 2015-07-19 21:07:45 -0400
  • 724f09c130 More arm stuffs! WayofTime 2015-07-19 19:06:22 -0400
  • 32e6539deb More attempts at the armour rendering, and an attempt to fix the entities. WayofTime 2015-07-19 17:01:18 -0400
  • 43c1386c78 Merge pull request #391 from qianzha/patch-10 WayofTime 2015-07-19 16:17:58 -0400
  • 19ed528d13 Experimentation with rendering the armour of the player. WayofTime 2015-07-19 14:44:12 -0400
  • e953f9e3eb Update zh_CN.lang (v1.3.3-4) qianzha 2015-07-19 20:43:20 +0800
  • bf068d1487 Fully fixed elementals. WayofTime 2015-07-18 16:38:47 -0400
  • 07973fb674 Merge pull request #390 from Arcaratus/master WayofTime 2015-07-18 10:18:02 -0400
  • 098d86596b Merge branch 'master' of https://github.com/WayofTime/BloodMagic Arcaratus 2015-07-18 10:08:42 -0400
  • ebad8a2e29 Changes to Demons WayofTime 2015-07-18 10:05:23 -0400
  • 461c2127be Fixed Elemental Crash Arcaratus 2015-07-18 10:02:06 -0400
  • d6a57ca644 Fix #169 WayofTime 2015-07-17 17:07:39 -0400
  • 375bfe4842 What were you doing here? WayofTime 2015-07-17 12:57:07 -0400
  • 12765e865b Fixed API calls. WayofTime 2015-07-17 12:07:38 -0400
  • 9b7b419ec8 Arcaratus and Vanilla are derps. WayofTime 2015-07-16 18:29:53 -0400
  • 1ca7795164 Merge pull request #387 from Arcaratus/master WayofTime 2015-07-16 09:48:08 -0400
  • 74f4e4f224 Refixed the Dismantler Arcaratus 2015-07-16 09:46:30 -0400
  • 77ae114b02 Merge pull request #386 from Arcaratus/master WayofTime 2015-07-16 09:31:56 -0400
  • 2557e02018 Fixed Ritual Dismantler Arcaratus 2015-07-16 09:29:21 -0400
  • 1bbf76063c Merge branch 'master' of https://github.com/WayofTime/BloodMagic WayofTime 2015-07-13 17:37:03 -0400
  • 82244a357b Removed useless shader class. WayofTime 2015-07-13 17:36:53 -0400
  • 6bdcfc4f46 Merge pull request #384 from Arcaratus/master WayofTime 2015-07-13 15:04:33 -0400
  • 2d6b1c4462 Add achievements Arcaratus 2015-07-13 14:25:10 -0400
  • 976df4e0e5 Merge pull request #382 from Arcaratus/master WayofTime 2015-07-10 16:55:16 -0400
  • a3903de11b Merge branch 'master' of https://github.com/Arcaratus/BloodMagic Arcaratus 2015-07-10 16:52:56 -0400
  • 0d9db7def1 Fix #381 Arcaratus 2015-07-10 16:51:00 -0400
  • f87cf547ac Fix #381 Arcaratus 2015-07-10 16:51:00 -0400
  • 8632aeb253 Merge pull request #379 from Arcaratus/master WayofTime 2015-07-09 11:30:50 -0400
  • 09b2c0cbd7 Redo Commit Arcaratus 2015-07-09 11:24:20 -0400
  • c607817bcd Fix #373 and did #375 Arcaratus 2015-07-09 11:17:55 -0400
  • 786498e615 Removed redundant book code. WayofTime 2015-07-08 22:03:38 -0400
  • 723a8b4a7e Merge pull request #314 from Adaptivity/master WayofTime 2015-07-07 14:24:17 -0400
  • 1280f4e0ae Merge pull request #372 from Arcaratus/master WayofTime 2015-07-06 18:55:55 -0400
  • 3328c4db74 Fix #370, #367 Arcaratus 2015-07-06 18:50:15 -0400
  • b75c0f5852 Merge pull request #369 from Arcaratus/master WayofTime 2015-07-02 11:19:37 -0400
  • e5b795fddc Performance Commit --Too lazy to do the Altar recipe Arcaratus 2015-07-02 11:05:07 -0400
  • 013367cffa Merge pull request #354 from Arcaratus/master WayofTime 2015-06-22 14:15:46 -0400
  • 96d271a5ee Should fix #361 Arcaratus 2015-06-22 13:01:42 -0400
  • 62879c48cb Fix things Arcaratus 2015-06-22 12:57:41 -0400
  • 234ba2bc1d Merge pull request #362 from Samernieve/patch-1 WayofTime 2015-06-21 13:27:11 -0400
  • 9686c6f8b5 Merge pull request #359 from ljfa-ag/magnetism WayofTime 2015-06-21 13:26:57 -0400
  • afee68be27 Update es_ES.lang Samernieve 2015-06-21 18:49:55 +0200
  • 9ac6377993 Cache values of isBlockOre for Magnetism ritual ljfa-ag 2015-06-21 15:32:13 +0200
  • a85e1688cf Add toString to ItemType ljfa-ag 2015-06-21 15:18:59 +0200
  • 7b0f3f6e3c Fixed the build properties. WayofTime 2015-06-19 07:05:51 -0400