Commit graph

1274 commits

Author SHA1 Message Date
WayofTime
3b7e58215b Last commit of mine before I update 2015-02-27 16:31:08 -05:00
WayofTime
adc14d5f46 Doing some minor tweaks for the release. 2015-02-27 16:10:16 -05:00
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
WayofTime
5bcf253659 Merge pull request #260 from TehNut/patch-3
Fix teleposerBlacklist shorthand support
2015-02-20 18:10:16 -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
WayofTime
df776f0323 Merge pull request #259 from TehNut/master
Add teleposer blacklist + Remove server files from repo
2015-02-20 16:52:07 -05:00
TehNut
6b3863bea4 Add teleposer blacklist 2015-02-20 13:37:48 -08:00
TehNut
c46141f0e7 Remove server files 2015-02-20 12:56:27 -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
WayofTime
72312f2cdf Merge pull request #258 from hilburn/master
Fixes Harvest Level of Deactivated Items
2015-02-18 14:59:41 -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
WayofTime
cf183a46ca Merge pull request #244 from hilburn/master
Should prevent Powered/Auto Spawners spawning demons
2015-02-05 19:09:02 -05: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
WayofTime
e47e41fda9 Merge pull request #237 from hilburn/master
Changes to Item Binding
2015-02-02 19:07:43 -05: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
WayofTime
fd0ba44834 Merge pull request #243 from Arcaratus/master
Added Achievements
2015-02-02 18:55:27 -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
WayofTime
25c8d238dd Merge pull request #242 from Vazkii/patch-1
Account for Use Golems in the fake player check
2015-02-02 14:03:20 -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
WayofTime
9e0e90d6e2 Merge pull request #239 from hilburn/mt-fix
Shapeless Blood Orb Recipe fix
2015-02-01 10:41:16 -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
WayofTime
4880e0cae7 Merge pull request #236 from benblank/diviner-interface
Allow other mods to recognize the Ritual Diviner using the API
2015-02-01 07:29:08 -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