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

378 commits

Author SHA1 Message Date
Arcaratus 96d271a5ee Should fix #361 2015-06-22 13:01:42 -04:00
Arcaratus 62879c48cb Fix things 2015-06-22 12:57:41 -04:00
ljfa-ag 9ac6377993 Cache values of isBlockOre for Magnetism ritual 2015-06-21 15:32:13 +02:00
ljfa-ag a85e1688cf Add toString to ItemType 2015-06-21 15:18:59 +02:00
Arcaratus 5e2a620a3b Small things 2015-06-14 10:33:01 -04:00
WayofTime 888b488fea Small changes 2015-06-13 18:06:23 -04:00
Arcaratus cf5a445fbb Added in a Guide-API download command 2015-06-13 17:46:48 -04:00
Arcaratus 3efabb4e26 Added in an auto-magic downloader for Guide-API 2015-06-12 21:37:40 -04:00
Arcaratus 4f9acb223f Merge remote-tracking branch 'upstream/master' 2015-06-12 15:12:22 -04:00
Arcaratus 90b34056c1 Shtuff 2015-06-12 15:11:56 -04:00
Arcaratus 8d2ab7aa7a Small stuff 2015-06-12 14:53:28 -04:00
ljfa-ag 321d489de0 Change ore block detection for Ritual of Magnetism 
fixes #347
 2015-06-10 20:20:19 +02:00
WayofTime 7d7db0b60f Upgraded to G-API v19 2015-06-04 17:07:23 -04:00
WayofTime 23106c7129 Finished the books~ 2015-05-27 16:31:47 -04:00
WayofTime 43538b6f69 Fixed +Arcaratus derp for one of the client events :D 2015-05-27 08:25:45 -04:00
WayofTime 8e8e314a48 Completed "The Demon Kin" and "The Battle Mage" 2015-05-26 11:47:42 -04:00
WayofTime c02f8a9e5f Updated Guide-API 2015-05-25 15:21:59 -04:00
WayofTime 5c01df44c1 Delivering packages in style! 2015-05-25 14:58:23 -04:00
WayofTime f553711573 Working on the Ritual Master (with images for rituals) 
Added a multi-block page for rituals
 2015-05-25 10:06:18 -04:00
WayofTime 39fb9ead81 Added the ability to configure the alchemy potions *shakes fist at +mDiyo * 2015-05-19 07:04:06 -04:00
WayofTime 96a5d93649 Merge pull request #331 from Arcaratus/master 
Sigil of Holding remake!
 2015-05-18 20:32:19 -04:00
WayofTime 55db2dd3ac A few last minute changes 2015-05-18 20:32:04 -04:00
Arcaratus 0f3c0196cd Sigil of Holding remake! 2015-05-18 18:33:23 -04:00
WayofTime 61cb569ffb Fixing the ritual diviner. 2015-05-11 21:46:51 -04:00
Arcaratus 9247e66f13 Added in Unbinding Ritual recipes (UnbindingRegistry.registerRecipe(outputItemStack, inputItemStack)) and automatic reversion of registered Binding Recipes. Renamed Binding Ritual class, updated ritual blacklist. Blood Magic, now with 8% more lightning! 2015-05-11 21:38:16 -04:00
Arcaratus 1eefcda6ca Fixed teleposers 2015-05-11 19:08:06 -04:00
Arcaratus 307184fb85 Revert "Fixed Teleposers" 
This reverts commit da9866ac8f.
 2015-05-11 19:05:14 -04:00
Arcaratus da9866ac8f Fixed Teleposers 2015-05-11 19:04:37 -04:00
WayofTime c36f752612 Readded the Blood Frame 2015-05-11 13:28:01 -04:00
WayofTime 2cc9d3a53a Added the Forestry API 2015-05-11 13:12:56 -04:00
WayofTime a0b1514efb Added a few more alchemy circles 2015-05-05 17:43:08 -04:00
WayofTime cab4b6b7cb Finished "The Architect," and added much fancier alchemy arrays to the water and lava rituals 2015-05-05 07:31:41 -04:00
WayofTime f74e4993cf Updated the books, worked more on the new self-sacrifice mechanics, allowed the teleposer to telepose entities across dimensions, changed the Focus of the Ellipsoid so that it now places blocks from a chest underneath the MRS. 2015-05-04 14:16:58 -04:00
WayofTime c71edfb937 Added variable incense - issue with build needs to be resolved in build.gradle 2015-05-01 18:56:16 -04:00
WayofTime f1ebade718 Working on an Incense mechanic... You'll find out! 2015-04-30 09:37:39 -04:00
Anton 47c9c8439d Git why 2015-04-30 15:22:37 +03:00
Anton 0bec104bf6 Solve merge conflicts? 2015-04-30 15:18:55 +03:00
WayofTime b90db3857b Ritual diviner now auto-constructs rituals. 2015-04-29 17:39:06 -04:00
Anton 47e7cad9e9 Make some messages localized serverside 2015-04-26 13:50:55 +03:00
WayofTime 9329387b6c Large amount of work on the book 2015-04-24 16:09:40 -04:00
WayofTime 45642e44bf Implemented guide pages 2015-04-24 07:56:46 -04:00
WayofTime 53ba21055d Actually fixed the VoidSigil ^_^ 2015-04-24 07:47:30 -04:00
WayofTime 634bab7688 Fixed the Liquid Sigils so that they would work on tanks again. 2015-04-24 07:41:08 -04:00
WayofTime 110deaf0e6 Added the Guide-API in order to start work on books. 2015-04-23 18:26:50 -04:00
WayofTime 3e53489162 Small tweak to prevent a possible annoyance. 2015-04-21 16:32:42 -04:00
WayofTime 34f779563e Added an AgriCraft Harvest Handler for their crops (uses reflection, so will be pulled as soon as the official one is made on their side) 
Added the checks required for Strength to affect the damage of the Tool Paradigms.
 2015-04-21 12:33:20 -04:00
WayofTime 201c70a766 Merge pull request #308 from Arcaratus/master 
Updated things
 2015-04-19 22:27:21 -04:00
WayofTime 7747d2221a Made stuff transparent 2015-04-19 22:24:30 -04:00
Arcaratus c2c2b1693e Update DaggerOfSacrifice.java 2015-04-19 14:53:46 -04:00
Arcaratus bc23585ab2 Update DaggerOfSacrifice.java 2015-04-19 14:53:14 -04:00
Arcaratus 5aaa863b61 Update AchievementsRegistry.java 2015-04-19 12:42:29 -04:00
WayofTime 6f182805aa Merge pull request #306 from Arcaratus/master 
Added things
 2015-04-19 12:40:27 -04:00
Arcaratus f9749a1fd5 Update Vector3.java 2015-04-19 12:26:28 -04:00
Arcaratus ba4a1015a5 Update RenderFakeBlocks.java 2015-04-19 12:26:13 -04:00
Arcaratus 4f0d8f16d2 Update RitualDivinerRender.java 2015-04-19 12:25:54 -04:00
Arcaratus bb9f321456 Yep 2015-04-19 12:24:42 -04:00
Arcaratus bf14e3ebb1 Added stuffs 2015-04-19 12:23:27 -04:00
WayofTime 89d723b3ee Work on a new ritual 2015-04-19 12:02:49 -04:00
Arcaratus 76f4b5b0d9 Update RitualDivinerRender.scala 2015-04-18 20:44:35 -04:00
Arcaratus 50d8827e3b Update AlchemicalWizardry.java 2015-04-18 20:40:41 -04:00
Arcaratus 72b1904f6b Merge remote-tracking branch 'origin/master' 
Conflicts:
	src/main/resources/assets/alchemicalwizardry/lang/en_US.lang
 2015-04-18 20:38:20 -04:00
Arcaratus 31f552fe2d Random stuffs 
Updated commands
Added in a ritual hologram --Alex's code
Added a Total Stones tooltip to the ritual diviner
Gave the Alchemy Relay a null bounding box
Added localizations to the blocks that didn't have any
 2015-04-18 19:49:09 -04:00
WayofTime e99f545694 Merge pull request #302 from ljfa-ag/phantom-bridge 
Fix phantom bridge blocks being one block too high on the client
 2015-04-18 17:11:29 -04:00
WayofTime 02c25f0bb0 1.3.2-1 2015-04-16 16:18:27 -04:00
ljfa-ag 2e5ec19c7d Fix phantom bridge blocks being one block too high on the client 
Fixes #301
 2015-04-16 17:04:06 +02:00
WayofTime 3d89bd6b90 Added an auto-crafting ritual 
Fixed Blood Light sigil glitches
Fixed some issues with the Reagent HP bar not draining correctly - what was I thinking?!?
 2015-04-16 09:02:19 -04:00
WayofTime f2b4f3db9e Added WoS reagent use, general touch ups. 2015-04-13 13:10:10 -04:00
WayofTime efa5d89539 Added several environmental-based abilities to the Wind and Fire armours. Tweaked the base armour penetration protection on the Omega armour to be a bit more balanced. Made the extra HP bar more fancy! :) 2015-04-12 10:59:41 -04:00
WayofTime 19d768bbfb Created 1.3.2Beta for testing 2015-04-11 18:08:30 -04:00
WayofTime 6dd95c23fa Added the final recipes required. Also added the Ritual Diviner that can place Dawn stones 2015-04-11 17:56:42 -04:00
WayofTime b725f7b814 Added the method to create the Omega armours, though it wasn't a secret for a while! :D 
Added the ability to enchant omega armour in such a way that there won't be a single best method
A bunch of other stuff I can't remember. Fun times!
 2015-04-11 15:43:06 -04:00
WayofTime afa3988a21 Merge pull request #299 from ljfa-ag/bound-pick 
Make item dropping from bound tools more efficient
 2015-04-10 19:46:58 -04:00
WayofTime 275d26be20 Fixed the funky item rendering for fast graphics when viewing the altar and chemistry sets. 2015-04-10 17:15:06 -04:00
WayofTime 80fab2df12 Fixed some @Arcaratus derps :D 2015-04-10 17:11:09 -04:00
WayofTime 7d0450cc63 Not much of anything 2015-04-10 17:07:27 -04:00
ljfa-ag a17de943c4 Fix client-side ghost items 2015-04-10 20:32:09 +02:00
ljfa-ag 1887df3d1e Apply to shovel and axe as well 2015-04-10 20:30:52 +02:00
Arcaratus dee92b4c87 IBloodAltar cleanup 2015-04-10 10:56:15 -04:00
Arcaratus 9c11124de7 IBloodAltar cleanup 2015-04-10 10:55:02 -04:00
Arcaratus 05a9822f7c IBloodAltar cleanup 2015-04-10 10:53:45 -04:00
Arcaratus b20359ac48 IBloodAltar cleanup 2015-04-10 10:53:23 -04:00
Arcaratus 76f9d83e4b IBloodAltar cleanup 2015-04-10 10:52:15 -04:00
Arcaratus 7443e3f167 IBloodAltar cleanup 2015-04-10 10:49:35 -04:00
Arcaratus 5951f4a236 IBloodAltar cleanup 2015-04-10 10:47:51 -04:00
Arcaratus 909bff5b20 IBloodAltar cleanup 2015-04-10 10:47:30 -04:00
ljfa-ag d800e06cb8 Refactor bound pickaxe item dropping 2015-04-10 15:53:33 +02:00
ljfa-ag 3a77de84d9 Create ItemType 2015-04-10 15:48:43 +02:00
ljfa-ag 74930a9445 Fix formatting to use spaces instead 2015-04-10 11:49:00 +02:00
WayofTime 833858d064 Merge pull request #269 from ljfa-ag/master 
Extracted base class for all tile entities with inventory
 2015-04-09 18:10:09 -04:00
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
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
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 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
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 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