Commit graph

1805 commits

Author SHA1 Message Date
WayofTime
ab0c49f8c7 General toying with the enchantments for the Omega armour, tweaked the ritual diviner's functionality, fixed teleposers not teleposing players in certain circumstances. 2015-04-08 09:52:51 -04:00
WayofTime
bab6e576d2 Merge branch 'master' of https://github.com/WayofTime/BloodMagic 2015-04-04 16:45:55 -04:00
WayofTime
ab8d25db76 Added the Dawn Scribing Tool + Dawn Ritual Stone
Fixed the ISidedInventory nature of the chemistry set
Added the Omega Reaction Chamber for initiating the Omega state
Experimented with enchantments
2015-04-04 16:35:42 -04:00
WayofTime
e41251f43a Merge pull request #283 from Arcaratus/master
Fixed my little dagger derp
2015-03-23 22:13:49 -04:00
Arcaratus
0b7d4442ee Update CreativeDagger.java 2015-03-23 17:48:41 -04:00
Arcaratus
f0b5353742 Update it to fill IBloodAltar 2015-03-22 11:49:28 -04:00
WayofTime
60ae47c499 Fixed Ghast Tear simple spell. The issue was "!" funny! 2015-03-21 10:10:25 -04:00
WayofTime
3bb1021944 Merge branch 'master' of https://github.com/WayofTime/BloodMagic 2015-03-19 15:26:09 -04:00
WayofTime
18d07baad3 More base-work on Omega 2015-03-19 15:26:03 -04:00
WayofTime
01be2abffd Merge pull request #272 from MaPePeR/WhirlwindAngleFiltering
Only reflect Projectiles that fly in the direction of the player
2015-03-19 15:25:07 -04:00
ljfa-ag
dd041f0842 Remove pointless if statement 2015-03-16 15:06:53 +01:00
WayofTime
d7d8aedd42 Fixed Harvest sigil in armour giving bad items
Finished optimization of compression handler.
2015-03-11 19:19:17 -04:00
MaPePeR
589562d5ca Only reflect Projectiles that head to the player 2015-03-07 16:09:50 +01:00
ljfa-ag
141fb78feb Make TEWritingTable extend TEInventory 2015-03-04 14:49:48 +01:00
ljfa-ag
f7de2ddef5 Only allow sensible items in Socket and Teleposer 2015-03-04 14:29:17 +01:00
ljfa-ag
252555cb3e Make TETeleposer extend TEInventory 2015-03-04 14:12:44 +01:00
ljfa-ag
3bb437d751 Make TESocket extend TEInventory 2015-03-04 14:10:02 +01:00
ljfa-ag
106eabbf9b Make TEPlinth extend TEInventory 2015-03-04 14:07:27 +01:00
ljfa-ag
8c65f1f347 Make TEPedestal extend TEInventory 2015-03-04 14:04:05 +01:00
ljfa-ag
3cabfff188 Make TEAltar extend TEInventory 2015-03-04 14:00:07 +01:00
ljfa-ag
35da0fadeb Create TEInventory 2015-03-04 13:48:12 +01:00
WayofTime
e21f6941ba Big lag reducer! Horray! 2015-03-03 18:40:11 -05:00
WayofTime
ff3e2685ff Big improvements on the compression handler. 2015-03-02 20:51:24 -05:00
WayofTime
a2a25626d4 Fixed the routing limits so that they now work for >=64 limits. 2015-02-28 17:31:50 -05:00
WayofTime
edc0e5cd9a Fixed an @Vazkii derp 2015-02-27 18:34:00 -05:00
WayofTime
660c1f66bd Merge pull request #264 from Vazkii/patch-2
Better fake player checking.
2015-02-27 18:33:01 -05:00
Lizbeth Rika
09b041e48e Derp 2015-02-27 23:24:44 +00:00
Lizbeth Rika
074e4ba25f Better fake player checking. 2015-02-27 23:23:19 +00:00
WayofTime
20d1a3968d The Final Commmmiiiiiiitttt~ Do do doooo doooo! Do do do do dooooo~
...I have no regrets.
2015-02-27 16:41:39 -05:00
WayofTime
5fdad1dc0d Merge pull request #263 from hilburn/master
Dagger of sacrifice cleanup
2015-02-27 16:38:29 -05:00
hilburn
e01a1f8937 Dagger of sacrifice cleanup
Wither and Dragon are instanceof IBossDisplayData
isChild is already checked
Generally stripped repeated code
2015-02-27 21:33:44 +00:00
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