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

450 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 d423ea5807 Merge pull request #304 from MrKunji/patch-3 
Update en_US.lang
 2015-04-18 17:11:44 -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
Patric Alexandre 45b8c0bd16 Update en_US.lang 
Thank to @ljafa-ag for pointing my failure, I'm not used to english grammar :p
 2015-04-17 20:23:18 -03: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 d1fc806113 Merge pull request #190 from AegisLesha/patch-3 
Update fr_FR.lang
 2015-04-14 12:35:08 -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
WayofTime 4d57cff61c Merge pull request #297 from MrKunji/patch-1 
Update en_US.lang
 2015-04-10 14:51:21 -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
WayofTime 003a65a51b Merge pull request #298 from Arcaratus/master 
Converted all TEAltar to IBloodAltar
 2015-04-10 11:02:00 -04: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
Patric Alexandre 9db5adc160 Update en_US.lang 
Set a example of how the achievments should be localized, it was broken:
http://i.imgur.com/p7uyvlW.png
 2015-04-09 18:41:04 -03: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
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