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

2510 commits

This branch
This branch
All branches
Author SHA1 Message Date
WayofTime 66501744f6 Merge pull request #156 from ganymedes01/master 
Enable lighting when rendering models. Everything looks a lot better!
 2014-11-13 17:22:10 -05:00
ganymedes01 de813e808a Enable lighting when rendering models. Everything looks a lot better! 2014-11-13 20:03:45 -02:00
WayofTime 6c4c579e89 Added RitualStopEvent and RitualRunEvent 2014-11-13 09:37:09 -05:00
WayofTime f39db196ca Moved more spell stuff, created localized APISpellHelper, created RitualActivatedEvent 2014-11-13 09:24:29 -05:00
WayofTime 8c1396421a Moving some spell classes, moved BloodUtils API stuff for books into main code 2014-11-13 08:42:49 -05:00
WayofTime beea2e875a Started working on allowing RitualDiviner to do directions. 
Completed refactorization of spell system.
Increased protection against void damage while void sigil is in Bound Armour.
Added an OnRitualStop with an Enum input providing the action.
Added more events.
 2014-11-12 17:14:43 -05:00
WayofTime 69abce8f85 Merge pull request #154 from TehNut/patch-1 
Remove extra syncConfig()
 2014-11-11 18:33:06 -05:00
Nick d488dbc887 Remove extra syncConfig() 
How did that even get there?
 2014-11-11 13:39:54 -08:00
WayofTime 526186b1ce Implemented orb filling event in the altar 2014-11-07 16:33:07 -05:00
WayofTime 8ac6cc76d8 Added AddToNetworkEvent 2014-11-07 16:22:29 -05:00
WayofTime 369ca6440f More progress on getting sigils to follow the events 2014-11-07 15:55:00 -05:00
WayofTime 39b4243a82 More work on the implementation of events 2014-11-07 13:45:02 -05:00
WayofTime dd3a093825 Merge pull request #152 from mysticdrew/master 
Plinth and Pedestal bounding box fix for servers
 2014-11-07 09:15:05 -05:00
mysticdrew 2f005dd677 Plinth and Pedestal bounding box fix for servers 2014-11-06 22:10:12 -06:00
WayofTime 40a45be05e Fixed check on unbreakable blocks for Crusher ritual, added event for items draining the SN 2014-11-06 21:25:53 -05:00
WayofTime 42afd64e30 Merge branch 'master' of https://github.com/WayofTime/BloodMagic 2014-11-06 18:01:17 -05:00
WayofTime 16efbcf7c5 Move of stuffs 2014-11-06 18:00:53 -05:00
WayofTime 0051a43398 Move of stuffs 2014-11-03 21:10:17 -05:00
WayofTime 7946a7c226 Merge pull request #150 from TehNut/master 
Switch to real logger, create ConfigGui, remove random debug thing, add ritual disabling
 2014-11-03 19:33:00 -05:00
TehNut aa16a13057 Include @Arcratus's config changes 2014-11-03 16:27:51 -08:00
TehNut 4638f1b239 Switch to real logger, create ConfigGui, remove random debug thing 
-Uses an actual logger instead of System.out.println.
-ConfigGui for ingame editing of configs.
-Some random leftover debug was being sent to console at startup. This
removes that.
 2014-11-03 16:11:10 -08:00
WayofTime 51346b5638 Initial comment to start using Blood Utils' book 2014-11-03 18:05:28 -05:00
WayofTime d1fa088923 Added filled belljars to the creative tab 2014-11-02 14:41:52 -05:00
WayofTime e7657f7429 Merge pull request #143 from Arcaratus/master 
Added a Creative Dagger
 2014-11-02 11:52:10 -05:00
WayofTime 6d9b565c98 Merge pull request #142 from TehNut/master 
Upgradle + Add Manifest
 2014-11-02 11:51:30 -05:00
Arcaratus 8a3097dce4 Added a Creative Dagger 2014-11-02 09:52:47 -05:00
Arcaratus 7b46758d87 Added a Creative Dagger 2014-11-02 09:49:20 -05:00
TehNut c988b69e85 Upgradle + Add Manifest 2014-11-01 18:04:00 -07:00
WayofTime 487a0ca48f Small Changes 2014-11-01 19:23:43 -04:00
WayofTime b95c6ad6f6 Fixed Heavy Heart effect to allow it to work on players 2014-11-01 17:55:00 -04:00
WayofTime 2f0ed920d4 Fixing Leap ritual. 2014-11-01 10:21:03 -04:00
WayofTime 04dcd073ad Commit 2014-11-01 08:26:41 -04:00
WayofTime 207af72c93 Merge pull request #139 from Arcaratus/master 
Cleaned up base mod file imports :P
 2014-11-01 08:20:59 -04:00
Arcaratus 62388afdd3 Cleaned up base mod file imports :P 2014-10-31 21:32:08 -04:00
Arcaratus 5794659ecd Update AlchemicalWizardry.java 2014-10-31 21:27:47 -04:00
WayofTime 19d050c398 Merge pull request #138 from TehNut/master 
Update buildscripts, re-add models that went missing, update mcmod.info
 2014-10-31 20:55:27 -04:00
TehNut 2f9384220a Update buildscripts, re-add things that went missing, update mcmod.info 2014-10-31 17:50:25 -07:00
WayofTime 32946aca68 Moment of truth! 2014-10-31 18:07:43 -04:00
WayofTime 986ddb5d18 Hope this works 2014-10-31 18:05:33 -04:00
WayofTime 72a8f0ccdb More stuff 2014-10-31 18:01:31 -04:00
WayofTime 1b7ee18816 Proper adding of gitignore - we'll see how this goes 2014-10-31 17:58:24 -04:00
WayofTime ecf0a7912e Adding gitignore 2014-10-31 17:54:59 -04:00
WayofTime a2b006105e Testing the creation of hell 2014-10-31 17:35:30 -04:00
WayofTime 796e75b1f9 Updating build scripts 2014-10-31 17:29:51 -04:00
WayofTime 4e9ce6964b Merge pull request #137 from Tombenpotter/master 
Added method to teleport entities across dimensions
 2014-10-31 15:33:36 -04:00
WayofTime e6fdd9f413 Merge pull request #126 from Alex-hawks/patch-1 
Add overload of syphonAndDamageFromNetwork that takes a String
 2014-10-31 15:33:09 -04:00
WayofTime bb412ded92 Merge branch 'master' of https://github.com/WayofTime/BloodMagic 2014-10-31 15:32:16 -04:00
WayofTime ab56e44480 Bunch of stuff required for Demon Invasion hoards 2014-10-31 15:31:56 -04:00
WayofTime 6998c43d59 Merge pull request #132 from qianzha/patch-7 
Update zh_TW.lang(v1.2.0b)
 2014-10-31 15:31:27 -04:00
WayofTime 575bd6ce74 Merge pull request #131 from qianzha/patch-6 
Update zh_CN.lang (v1.2.0b)
 2014-10-31 15:31:20 -04:00