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

378 commits

Author SHA1 Message Date
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
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
Arcaratus c447106cb1 Performance Commit 2 2015-07-28 13:49:26 -04:00
Arcaratus acfc78187f Added in the Demon Spawn achievement 2015-07-28 13:03:47 -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
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 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 19ed528d13 Experimentation with rendering the armour of the player. 2015-07-19 14:44:12 -04:00
WayofTime bf068d1487 Fully fixed elementals. 2015-07-18 16:38:47 -04:00
Arcaratus 098d86596b Merge branch 'master' of https://github.com/WayofTime/BloodMagic 
Conflicts:
	src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBoulderFist.java
 2015-07-18 10:08:42 -04:00
WayofTime ebad8a2e29 Changes to Demons 2015-07-18 10:05:23 -04:00
Arcaratus 461c2127be Fixed Elemental Crash 2015-07-18 10:02:06 -04:00
WayofTime d6a57ca644 Fix #169 2015-07-17 17:07:39 -04:00
WayofTime 12765e865b Fixed API calls. 2015-07-17 12:07:38 -04:00
WayofTime 9b7b419ec8 Arcaratus and Vanilla are derps. 2015-07-16 18:29:53 -04:00
WayofTime 1ca7795164 Merge pull request #387 from Arcaratus/master 
Refixed the Dismantler
 2015-07-16 09:48:08 -04:00
Arcaratus 74f4e4f224 Refixed the Dismantler 2015-07-16 09:46:30 -04:00
WayofTime 77ae114b02 Merge pull request #386 from Arcaratus/master 
Fixed Ritual Dismantler
 2015-07-16 09:31:56 -04:00
Arcaratus 2557e02018 Fixed Ritual Dismantler 2015-07-16 09:29:21 -04:00
WayofTime 1bbf76063c Merge branch 'master' of https://github.com/WayofTime/BloodMagic 2015-07-13 17:37:03 -04:00
WayofTime 82244a357b Removed useless shader class. 2015-07-13 17:36:53 -04:00
Arcaratus 2d6b1c4462 Add achievements 2015-07-13 14:25:10 -04:00
Arcaratus 0d9db7def1 Fix #381 2015-07-10 16:52:39 -04:00
Arcaratus 09b2c0cbd7 Redo Commit 2015-07-09 11:24:20 -04:00
Arcaratus c607817bcd Fix #373 and did #375 2015-07-09 11:17:55 -04:00
WayofTime 786498e615 Removed redundant book code. 2015-07-08 22:03:38 -04:00
WayofTime 723a8b4a7e Merge pull request #314 from Adaptivity/master 
Make some messages localized serverside
 2015-07-07 14:24:17 -04:00
Arcaratus 3328c4db74 Fix #370, #367 2015-07-06 18:50:15 -04:00
Arcaratus e5b795fddc Performance Commit --Too lazy to do the Altar recipe 2015-07-02 11:05:07 -04:00
Arcaratus 96d271a5ee Should fix #361 2015-06-22 13:01:42 -04:00
Arcaratus 62879c48cb Fix things 2015-06-22 12:57:41 -04:00
ljfa-ag 9ac6377993 Cache values of isBlockOre for Magnetism ritual 2015-06-21 15:32:13 +02:00
ljfa-ag a85e1688cf Add toString to ItemType 2015-06-21 15:18:59 +02:00
Arcaratus 5e2a620a3b Small things 2015-06-14 10:33:01 -04:00
WayofTime 888b488fea Small changes 2015-06-13 18:06:23 -04:00
Arcaratus cf5a445fbb Added in a Guide-API download command 2015-06-13 17:46:48 -04:00
Arcaratus 3efabb4e26 Added in an auto-magic downloader for Guide-API 2015-06-12 21:37:40 -04:00
Arcaratus 4f9acb223f Merge remote-tracking branch 'upstream/master' 2015-06-12 15:12:22 -04:00
Arcaratus 90b34056c1 Shtuff 2015-06-12 15:11:56 -04:00
Arcaratus 8d2ab7aa7a Small stuff 2015-06-12 14:53:28 -04:00
ljfa-ag 321d489de0 Change ore block detection for Ritual of Magnetism 
fixes #347
 2015-06-10 20:20:19 +02:00
WayofTime 7d7db0b60f Upgraded to G-API v19 2015-06-04 17:07:23 -04:00
WayofTime 23106c7129 Finished the books~ 2015-05-27 16:31:47 -04:00
WayofTime 43538b6f69 Fixed +Arcaratus derp for one of the client events :D 2015-05-27 08:25:45 -04:00
WayofTime 8e8e314a48 Completed "The Demon Kin" and "The Battle Mage" 2015-05-26 11:47:42 -04:00
WayofTime c02f8a9e5f Updated Guide-API 2015-05-25 15:21:59 -04:00
WayofTime 5c01df44c1 Delivering packages in style! 2015-05-25 14:58:23 -04:00
WayofTime f553711573 Working on the Ritual Master (with images for rituals) 
Added a multi-block page for rituals
 2015-05-25 10:06:18 -04:00
WayofTime 39fb9ead81 Added the ability to configure the alchemy potions *shakes fist at +mDiyo * 2015-05-19 07:04:06 -04:00
WayofTime 96a5d93649 Merge pull request #331 from Arcaratus/master 
Sigil of Holding remake!
 2015-05-18 20:32:19 -04:00
WayofTime 55db2dd3ac A few last minute changes 2015-05-18 20:32:04 -04:00
Arcaratus 0f3c0196cd Sigil of Holding remake! 2015-05-18 18:33:23 -04:00
WayofTime 61cb569ffb Fixing the ritual diviner. 2015-05-11 21:46:51 -04:00
Arcaratus 9247e66f13 Added in Unbinding Ritual recipes (UnbindingRegistry.registerRecipe(outputItemStack, inputItemStack)) and automatic reversion of registered Binding Recipes. Renamed Binding Ritual class, updated ritual blacklist. Blood Magic, now with 8% more lightning! 2015-05-11 21:38:16 -04:00
Arcaratus 1eefcda6ca Fixed teleposers 2015-05-11 19:08:06 -04:00
Arcaratus 307184fb85 Revert "Fixed Teleposers" 
This reverts commit da9866ac8f.
 2015-05-11 19:05:14 -04:00
Arcaratus da9866ac8f Fixed Teleposers 2015-05-11 19:04:37 -04:00
WayofTime c36f752612 Readded the Blood Frame 2015-05-11 13:28:01 -04:00
WayofTime 2cc9d3a53a Added the Forestry API 2015-05-11 13:12:56 -04:00
WayofTime a0b1514efb Added a few more alchemy circles 2015-05-05 17:43:08 -04:00
WayofTime cab4b6b7cb Finished "The Architect," and added much fancier alchemy arrays to the water and lava rituals 2015-05-05 07:31:41 -04:00
WayofTime f74e4993cf Updated the books, worked more on the new self-sacrifice mechanics, allowed the teleposer to telepose entities across dimensions, changed the Focus of the Ellipsoid so that it now places blocks from a chest underneath the MRS. 2015-05-04 14:16:58 -04:00
WayofTime c71edfb937 Added variable incense - issue with build needs to be resolved in build.gradle 2015-05-01 18:56:16 -04:00
WayofTime f1ebade718 Working on an Incense mechanic... You'll find out! 2015-04-30 09:37:39 -04:00
Anton 47c9c8439d Git why 2015-04-30 15:22:37 +03:00
Anton 0bec104bf6 Solve merge conflicts? 2015-04-30 15:18:55 +03:00
WayofTime b90db3857b Ritual diviner now auto-constructs rituals. 2015-04-29 17:39:06 -04:00
Anton 47e7cad9e9 Make some messages localized serverside 2015-04-26 13:50:55 +03:00
WayofTime 9329387b6c Large amount of work on the book 2015-04-24 16:09:40 -04:00
WayofTime 45642e44bf Implemented guide pages 2015-04-24 07:56:46 -04:00
WayofTime 53ba21055d Actually fixed the VoidSigil ^_^ 2015-04-24 07:47:30 -04:00
WayofTime 634bab7688 Fixed the Liquid Sigils so that they would work on tanks again. 2015-04-24 07:41:08 -04:00
WayofTime 110deaf0e6 Added the Guide-API in order to start work on books. 2015-04-23 18:26:50 -04:00
WayofTime 3e53489162 Small tweak to prevent a possible annoyance. 2015-04-21 16:32:42 -04:00
WayofTime 34f779563e Added an AgriCraft Harvest Handler for their crops (uses reflection, so will be pulled as soon as the official one is made on their side) 
Added the checks required for Strength to affect the damage of the Tool Paradigms.
 2015-04-21 12:33:20 -04:00
WayofTime 201c70a766 Merge pull request #308 from Arcaratus/master 
Updated things
 2015-04-19 22:27:21 -04:00
WayofTime 7747d2221a Made stuff transparent 2015-04-19 22:24:30 -04:00
Arcaratus c2c2b1693e Update DaggerOfSacrifice.java 2015-04-19 14:53:46 -04:00
Arcaratus bc23585ab2 Update DaggerOfSacrifice.java 2015-04-19 14:53:14 -04:00