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

218 commits

Author SHA1 Message Date
WayofTime 39e3d6eb34 Added a crafting cooldown on IAltar, so that outside blocks may request the altar to not perform work while it is not active. 2015-02-27 08:31:39 -05:00
WayofTime 8fbb19acc0 Fully optimized the compression handler~ 2015-02-26 17:32:53 -05:00
WayofTime 2f47ffa955 Merge pull request #262 from hilburn/master 
Fixes API
 2015-02-25 06:11:42 -05:00
hilburn c8d6e6d5ae Fixes API 2015-02-25 03:22:23 +00:00
WayofTime 4eb22891ad Merge branch 'master' of https://github.com/WayofTime/BloodMagic 2015-02-23 18:45:44 -05:00
WayofTime 086027faf5 Added Sacrificial Knife event 2015-02-23 18:45:32 -05:00
Nick 14d11ef7be Fix teleposerBlacklist shorthand syntax 
I derped and forgot to support `modid:blockname` automatically using a meta of `0`.
 2015-02-20 15:09:30 -08:00
TehNut 6b3863bea4 Add teleposer blacklist 2015-02-20 13:37:48 -08:00
WayofTime 436ba63fc8 Merge branch 'master' of https://github.com/WayofTime/BloodMagic 2015-02-20 15:52:23 -05:00
WayofTime dc7d9ebc06 Finishing the darn Phantom Hands ritual 2015-02-20 15:52:11 -05:00
hilburn c12e95d07a Merge remote-tracking branch 'upstream/master' 2015-02-18 19:54:35 +00:00
hilburn 82f2dab8c1 Harvest Level returns 0 for deactivated tools 2015-02-18 19:54:20 +00:00
WayofTime f87da36775 Working on The Architect book - working out well~ 2015-02-16 07:26:03 -05:00
WayofTime 1c806c4328 Fruitful work on .txt document parser 2015-02-14 21:37:47 -05:00
WayofTime 815dc167dd Merge branch 'master' of https://github.com/WayofTime/BloodMagic 2015-02-13 14:48:34 -05:00
WayofTime a1fa511e7a Funness - I can't spell 2015-02-13 14:48:22 -05:00
WayofTime 18fdcdac1c Merge pull request #250 from hilburn/master 
Blacklist Tile Accelerators
 2015-02-13 11:29:56 -05:00
WayofTime 6c501c10c0 Merge pull request #249 from hilburn/diviner_changes 
Diviner Changes
 2015-02-13 11:29:47 -05:00
WayofTime 246b654e03 Merge pull request #254 from hilburn/soul-fray-fix 
Prevents removal of Soul Fray with milk
 2015-02-13 11:29:29 -05:00
hilburn f10189efad Prevents removal of Soul Fray with milk 
Yes it's stupid, Potions are stupid
 2015-02-13 02:01:11 +00:00
hilburn 678870c8f6 Blacklist ChromatiCraft Tile Accelerator 2015-02-07 11:41:09 +00:00
hilburn 365f658837 Blacklist Time Torch 
Talking to Reika about the ChromatiCraft one
 2015-02-06 02:32:23 +00:00
hilburn 9cf011fbd9 Diviner Changes 
Doesn't require Ritual Stones in creative mode
Doesn't scroll both the direction and ritual any more (direction only
changes when non-shifted)
Can scroll the direction backwards
 2015-02-06 00:44:01 +00:00
hilburn ee44f2a979 Disables Grinder for Demons too 
Because instakilling is silly
 2015-02-04 15:44:57 +00:00
hilburn f79d50f084 Should prevent Powered/Auto Spawners spawning demons 2015-02-04 03:10:39 +00:00
hilburn 976599afe0 Changes to Item Binding 
Allows event to cancel the binding (rather than set key to "" which had
the same effect but was messy)

Prevents binding by Fake Players
 2015-02-03 00:03:43 +00:00
WayofTime aa33b6b8ff Thanks Kihira <3 2015-02-02 18:56:23 -05:00
Arcaratus 66eb46f8c4 Added Achievements 2015-02-02 17:23:56 -05:00
Arcaratus f3c21d9b97 Added Achievements 2015-02-02 17:22:53 -05:00
Arcaratus 1a0cc36fd6 Added Achievements 2015-02-02 17:22:10 -05:00
Arcaratus 35bb173292 Added Achievements 2015-02-02 17:20:21 -05:00
Lizbeth Rika 4eaa4763c6 Account for Use Golems in the fake player check 2015-02-02 17:39:40 +00:00
WayofTime b57c490856 Merge branch 'master' of https://github.com/WayofTime/BloodMagic 2015-02-01 10:41:57 -05:00
WayofTime 016aac34d4 Stuffs. 2015-02-01 10:41:53 -05:00
hilburn 3238b3e787 Shapeless Blood Orb Recipe fix 2015-02-01 13:52:48 +00:00
WayofTime c6ba742d5f Merge pull request #238 from hilburn/mt-fix 
Blood Orb MT fix
 2015-02-01 07:29:39 -05:00
hilburn b24396c66f Blood Orb MT fix 2015-02-01 12:27:51 +00:00
Ben Blank c0cb436797 extract an interface representing the Ritual Diviner into the API for use by other mods 2015-01-31 11:44:05 -08:00
WayofTime 885d1a41de Merge pull request #232 from hilburn/master 
MineTweaker additions
 2015-01-31 11:48:03 -05:00
WayofTime 82b1663651 Merge pull request #235 from chbachman/patch-2 
Remove calls to SpellHelper, redirect to APISpellHelper
 2015-01-31 11:47:07 -05:00
WayofTime 3b590fab6c Almost finished Ritual for item routing 2015-01-31 11:46:49 -05:00
Chandler e43f313396 Remove import 2015-01-31 10:37:04 -06:00
Chandler f2916909cd Remove Calls to SpellHelper 2015-01-31 10:34:06 -06:00
Chandler 766db75cfa Remove Calls to SpellHelper 2015-01-31 10:32:01 -06:00
WayofTime 539bb564fa Removed needing a buffer chest for the new item routing ritual - working on a few odd quirks, however. 2015-01-30 18:53:52 -05:00
WayofTime 2888fcfe07 Merge branch 'master' of https://github.com/WayofTime/BloodMagic 2015-01-30 09:29:53 -05:00
WayofTime ae1b86def2 A book is a book is a book 2015-01-30 09:29:22 -05:00
hilburn afcb284479 MineTweaker additions 
Harvest Moon gets an add custom crop type that's itemstack sensitive for
crops that share an item for seeds., it's not perfect but it works
pretty well.
Also gets a MT method to interface with this new harvest type
MT functions to add/remove focus items for falling tower as well as
define the meteor size and distribution.
 2015-01-28 18:21:03 +00:00
Reika d7cedd2c57 Update TeleposeEvent.java 
Add a convenience function (which may or may not be partly to keep my handler's code from going off my screen :P )
 2015-01-25 23:23:03 -05:00
WayofTime 5b4d4ff498 Merge pull request #223 from Adaptivity/sorting 
Sorted new strings
 2015-01-25 07:09:53 -05:00
WayofTime e15c52d48f Merge pull request #229 from Sciencei/master 
Expanded plants that Sigil of Growth/Ritual of the Green Grove work with
 2015-01-25 07:09:46 -05:00
Cullin 0bcba76689 Another typo fixed. Thank goodness for ides 2015-01-25 05:34:45 -05:00
Sciencei 2a493b80b9 Expanded affected plants 
Essentially the same change made to RitualEffectGrowth- ie, plants that implement IGrowable but not IPlantable will now be included in the accelerated growth effect.
 2015-01-25 04:51:56 -05:00
Sciencei 951984e75c Fixed import typo 
Currently editing on github, so no error checking :P
 2015-01-25 04:50:23 -05:00
Sciencei 30ebc597ee Expanded affected plants 
Now checks for IGrowable (basically the 'bonemealable' class) as well as IPlantable. Not 100% sure why, but some mods use it instead of IPlantable. Off the top of my head is Pneumaticraft, as I was sent here by this issue https://github.com/MineMaarten/PneumaticCraft/issues/386.
 2015-01-25 04:44:05 -05:00
Reika e32744f3b3 Update and rename TeleposeEvent to TeleposeEvent.java 2015-01-25 03:08:49 -05:00
Reika 5f0aff3595 Create TeleposeEvent 2015-01-25 03:08:24 -05:00
Reika 1754fcc49e Add event hook 2015-01-25 03:03:20 -05:00
WayofTime 389910f716 Book tests and Movage of Int3 2015-01-24 08:18:58 -05:00
Adaptivity ea2224ba10 Sorted new strings 2015-01-23 18:57:52 +03:00
WayofTime fffef9a274 Attempt #3 2015-01-23 08:26:39 -05:00
WayofTime ed39b33167 Attempt to solve awesomeness 2015-01-23 08:10:16 -05:00
WayofTime d01093a441 Merge pull request #220 from Adaptivity/morelocalization 
Long-awaited feature(Localized messages and more)
 2015-01-23 07:56:05 -05:00
WayofTime 882b54d892 Fixed OmegaArmour client-server-side issue. 2015-01-23 07:53:40 -05:00
Adaptivity c06c34f6b7 Long-awaited feature(Localized messages and more) 2015-01-22 20:13:57 +03:00
WayofTime 468734125a ...Made the ritual work again. Oops. 2015-01-20 17:40:43 -05:00
WayofTime 1b4879ad64 Added Item Routing ritual. 
Added performance improvements to magnetism ritual!
 2015-01-20 17:27:53 -05:00
WayofTime 2f0a1c9909 Changed the Meteor paradigm to POTENTIALLY allow GT ores to be spawnable with the meteor. Potentially. 2015-01-16 11:22:50 -05:00
WayofTime eb9284faf7 1.3.0b 2015-01-16 10:36:50 -05:00
WayofTime 56ccd3188d Refactoring 2015-01-16 10:00:50 -05:00
WayofTime fd330233dd Added new LocalRitualStorage methods, to allow rituals to store data more fluidly. 2015-01-14 21:44:59 -05:00
WayofTime ac5a20d5b2 Moar Omega, fixed Bound tool check to see if block is silk-touchable 2015-01-14 17:26:14 -05:00
WayofTime 6cb1e06306 New client -> server packet handler, added key to allow using the Project: Omega's signature effects 2015-01-13 21:02:11 -05:00
WayofTime ca74a33a12 Potential fix for Zephyr ritual dupe bug, some adjustments to rendering of a fancy new health bar. 2015-01-12 17:04:44 -05:00
WayofTime 8315dcf864 Added demon limit to config - maximum number of demons that may spawn for a Demon Portal 2015-01-11 21:19:49 -05:00
WayofTime 316a79fab8 Initial stages of Omega being worked on - binding of human and demon at 5%. 2015-01-11 21:05:28 -05:00
WayofTime c0abd69a2a Adding needed backend stuff in the form of packet handling 2015-01-10 14:31:24 -05:00
WayofTime fd437fb4ca Initiating Omega protocol. 2015-01-10 12:23:41 -05:00
Arcaratus b82c13521d Commands Part 3 2015-01-03 10:53:16 -05:00
Arcaratus b7bd031028 Commands Part 3 2015-01-03 10:50:57 -05:00
Arcaratus 5e91c1a91f Commands Part 2 2015-01-03 10:28:09 -05:00
Arcaratus b5eec00c7b Commands Part 2 2015-01-03 10:27:56 -05:00
Arcaratus 30e4ed064d Commands Part 2 2015-01-03 10:27:40 -05:00
Arcaratus 40aa2534ee Commands Part 2 2015-01-03 10:26:56 -05:00
Arcaratus 4d90e540b8 Commands Part 2 2015-01-03 10:25:50 -05:00
Arcaratus 3b7fe970aa Commands Part 1 2015-01-03 10:23:17 -05:00
WayofTime 7245c556e2 1.3.0a-1 2014-12-29 16:21:12 -05:00
WayofTime dd2041ea54 Merge pull request #186 from Cisien/patch-1 
fix addToDemonBloodDuration
 2014-12-29 06:48:26 -05:00
WayofTime fa5fe1555c Removed debug stuff ;-; 2014-12-29 06:48:01 -05:00
Chris 34dc2f2244 fix addToDemonBloodDuration 
Add duration to demonBloodDuration instead of just incrementing it
 2014-12-28 21:35:18 -08:00
WayofTime 31e154a980 Added configs to have the Demon Invasion only work when using the Creative Activation Crystal (still uses LP, you scrub.). Re-fixed blood orb so that FakePlayers can't use it. Why did this get re-broken? 2014-12-18 13:00:11 -05:00
WayofTime d8f267b7e3 Commitment 2014-12-13 19:17:38 -05:00
Arcaratus e37691fec4 Added Binding Rituals for NEI 2014-12-13 10:17:53 -05:00
WayofTime f08363b74a Pushed a beta release 2014-12-11 20:08:24 -05:00
WayofTime b30d6de13c Added client-side LP bar. Need a few more things before I can release, such as when it occurs etc. 2014-12-11 16:37:26 -05:00
WayofTime dbf4232ca0 Fixed demon paths so that Double-tall grass doesn't mess it up 2014-12-10 21:33:04 -05:00
WayofTime 08a8f1dc13 Added Guardians 2014-12-10 11:01:03 -05:00
WayofTime a2b0f59765 More assets for Reagent guage 2014-12-09 20:34:48 -05:00
WayofTime 9ad3330e08 Minor tweaks + experimenting with a reagent guage for Project: Omega 2014-12-09 19:06:47 -05:00
WayofTime 22afbcbd11 Hoard demons no longer 1HKO'd by dagger 2014-12-05 15:11:05 -05:00