Commit graph

158 commits

Author SHA1 Message Date
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