Commit graph

233 commits

Author SHA1 Message Date
Nick 13d9cb4b5a Add registry for Binding rituals and add JEI support 2015-12-02 19:27:28 -08:00
Nick 42d6c4b59b Whoops, forgot EtherealSlates 2015-12-02 16:28:07 -08:00
Nick 7dd170e5ad Inscription Tools and Slates 2015-12-02 00:55:32 -08:00
Nick 437dc1b96e Tweaks to damage. It now uses the DamageSource correctly 2015-12-01 23:35:09 -08:00
Nick ff055a33da Some cleanup
Changed AltarMaker chat anti-spam.
Fixed formatting for AltarMaker messages
2015-11-29 17:12:44 -08:00
Arcaratus 9eb3097b5a Added assets 2015-11-29 19:33:17 -05:00
Nick ac29e593ba Localize ritual stones 2015-11-29 01:32:52 -08:00
Nick 91f88b846f Add support for JustEnoughItems
Will build on as we add more recipe types.
2015-11-28 23:52:06 -08:00
Nick 34dee6447b A whole lot of formatting cleanup
Also changes NBTHolder to a standard Constants class with subclasses for each category
2015-11-28 18:25:46 -08:00
Nick cbd4f8c75f First pass on Pedestal/Plinth
I just want this out of my uncommitted file list...
2015-11-22 14:03:51 -08:00
Nick 9035f800e2 Easier handling of meta blocks 2015-11-17 15:52:31 -08:00
Nick 9a6d8d6d60 Blood Letter's Pack + Coat of Arms 2015-11-11 10:45:46 -08:00
Arcaratus 86fcd4808b Finished Water, Lava, and Void sigils
Also added in bloodstone
2015-11-07 21:37:12 -05:00
Arcaratus 2fc34a5138 Sacrificial Commit 2015-11-07 11:51:41 -05:00
WayofTime bf912ae03f Created the BlockRitualStone and had it implement IRitualStone. Created .json files necessary
Created PropertyRuneType.
2015-11-06 21:41:15 -05:00
WayofTime 8f623de469 Created test block which is coupled to the Default Spell Modifier .json model. The model has three submodels: the core, the output, and the input. 2015-11-06 17:26:38 -05:00
Arcaratus ab60e5f3fe Finished the Altar 2015-11-03 10:34:11 -05:00
Nick ac5402df6b Cleanup
Renders for Runes
Creative crystal renders
Formatting
Lang additions
Some attempted (not successful) fixes for SoulNetwork
2015-11-02 19:18:53 -08:00
Nick 72041e936a Altar renders now 2015-11-02 15:28:33 -08:00
Nick 096ba02450 Refactor everything to WayofTime.bloodmagic.* 2015-11-02 12:39:47 -08:00
Nick 3a7e0a3a8c Begin rituals + some refactoring 2015-10-31 13:47:43 -07:00
Nick 07b1f36594 Okay... They render now... 2015-10-30 22:07:06 -07:00
Nick b45172294d JSON models hurt my head 2015-10-30 21:20:23 -07:00
Nick 2bf78bc61c Divination Sigil no longer spams chat 2015-10-30 16:54:59 -07:00
Nick 09ff96fe03 Life Essence 2015-10-29 22:22:08 -07:00
Nick 61365dc80f Use abstracted ModelLoader method in Orb Registry + Stop Orb JSON spam 2015-10-29 22:06:18 -07:00
Nick ce5e529135 Move old blockstates to old folder 2015-10-29 22:05:48 -07:00
Nick e3d4afa123 Rewrite is Go!
Just moving over all my changes from my fork
2015-10-29 20:22:16 -07:00
Arcaratus d15c4f2c8e JSON and the Arghhhh-onauts 2015-08-24 17:27:49 -04:00
WayofTime 9658ce06f7 A lot more .json files (4) 2015-08-17 20:16:39 -04:00
WayofTime 93d5f4ad83 Texturez (3) 2015-08-12 17:24:45 -04:00
WayofTime 010f9ec49c Moar .jsons (wow, that's a lot...) (2) 2015-08-12 14:41:01 -04:00
WayofTime 8006c87e06 Slowly adding the .jsons (1) 2015-08-12 14:20:17 -04:00
Arcaratus a2c4f4b965 All the items !sigils 2015-07-30 17:24:20 -04:00
WayofTime 8241c3cbd1 Added the .jsons for the base runes and added the BlockStates to it. 2015-07-29 22:07:13 -04:00
WayofTime aed8436204 Deleted unused resources, added a test .json for the armour forge. 2015-07-29 21:45:19 -04:00
Arcaratus 419f532502 Finished all Blocks 2015-07-29 14:35:00 -04:00
Arcaratus e5abfd03e5 Did ModBlocks 2015-07-29 11:30:24 -04:00
WayofTime c5681dc831 Initial commit of BM 1.8 2015-07-29 08:23:01 -04:00
Arcaratus c447106cb1 Performance Commit 2 2015-07-28 13:49:26 -04:00
Arcaratus acfc78187f Added in the Demon Spawn achievement 2015-07-28 13:03:47 -04:00
qianzha e953f9e3eb Update zh_CN.lang (v1.3.3-4) 2015-07-19 20:43:20 +08:00
WayofTime 375bfe4842 What were you doing here? 2015-07-17 12:57:07 -04:00
Arcaratus 2d6b1c4462 Add achievements 2015-07-13 14:25:10 -04:00
WayofTime 723a8b4a7e Merge pull request #314 from Adaptivity/master
Make some messages localized serverside
2015-07-07 14:24:17 -04:00
Arcaratus 62879c48cb Fix things 2015-06-22 12:57:41 -04:00
Samernieve afee68be27 Update es_ES.lang
Added the full translation into Spanish.
2015-06-21 18:49:55 +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 4a32683322 Update .lang 2015-06-12 21:42:38 -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 8d2ab7aa7a Small stuff 2015-06-12 14:53:28 -04:00
NatsuArashi f8e272ca02 Update zh_TW.lang
STILL WORKING
2015-06-10 17:45:33 +08: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 8e8e314a48 Completed "The Demon Kin" and "The Battle Mage" 2015-05-26 11:47:42 -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 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
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 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 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
Arcaratus bf14e3ebb1 Added stuffs 2015-04-19 12:23:27 -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
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 d1fc806113 Merge pull request #190 from AegisLesha/patch-3
Update fr_FR.lang
2015-04-14 12:35:08 -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 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
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 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 60ae47c499 Fixed Ghast Tear simple spell. The issue was "!" funny! 2015-03-21 10:10:25 -04:00
WayofTime 3b7e58215b Last commit of mine before I update 2015-02-27 16:31:08 -05:00
WayofTime 086027faf5 Added Sacrificial Knife event 2015-02-23 18:45:32 -05:00
WayofTime dc7d9ebc06 Finishing the darn Phantom Hands ritual 2015-02-20 15:52:11 -05: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 a1fa511e7a Funness - I can't spell 2015-02-13 14:48:22 -05:00
Arcaratus 66eb46f8c4 Added Achievements 2015-02-02 17:23:56 -05:00
WayofTime 3b590fab6c Almost finished Ritual for item routing 2015-01-31 11:46:49 -05: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 ae1b86def2 A book is a book is a book 2015-01-30 09:29:22 -05:00
WayofTime 5b4d4ff498 Merge pull request #223 from Adaptivity/sorting
Sorted new strings
2015-01-25 07:09:53 -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
Adaptivity c06c34f6b7 Long-awaited feature(Localized messages and more) 2015-01-22 20:13:57 +03:00
WayofTime 1b4879ad64 Added Item Routing ritual.
Added performance improvements to magnetism ritual!
2015-01-20 17:27:53 -05:00
WayofTime 316a79fab8 Initial stages of Omega being worked on - binding of human and demon at 5%. 2015-01-11 21:05:28 -05:00
WayofTime fd437fb4ca Initiating Omega protocol. 2015-01-10 12:23:41 -05:00
Arcaratus b7bd031028 Commands Part 3 2015-01-03 10:50:57 -05:00
Jean-Marie S. 0bdd813995 Update fr_FR.lang
Update + Massive Overhaul... at last \o/
(I guess it's complete, tell me if it's not :3)


OH AND HAPPY NEW YEAR \o/
2014-12-31 23:41:50 +01:00
WayofTime fa5fe1555c Removed debug stuff ;-; 2014-12-29 06:48:01 -05:00
WayofTime 31e154a980 Added configs to have the Demon Invasion only work when using the Creative Activation Crystal (still uses LP, you scrub.). Re-fixed blood orb so that FakePlayers can't use it. Why did this get re-broken? 2014-12-18 13:00:11 -05:00
WayofTime d8f267b7e3 Commitment 2014-12-13 19:17:38 -05:00
Arcaratus e37691fec4 Added Binding Rituals for NEI 2014-12-13 10:17:53 -05:00
WayofTime b30d6de13c Added client-side LP bar. Need a few more things before I can release, such as when it occurs etc. 2014-12-11 16:37:26 -05:00
WayofTime 08a8f1dc13 Added Guardians 2014-12-10 11:01:03 -05:00
WayofTime a2b0f59765 More assets for Reagent guage 2014-12-09 20:34:48 -05:00
WayofTime 22afbcbd11 Hoard demons no longer 1HKO'd by dagger 2014-12-05 15:11:05 -05:00
WayofTime 574f43010d Added more recipes, made Imbued Spell Enhancements craftable 2014-12-05 12:13:10 -05:00
WayofTime 9b0fa9b052 Created all code necessary to summon the portal. I'm awesome, I know. 2014-12-04 14:31:31 -05:00
WayofTime 832ed15060 Finished text parser 2014-12-02 19:18:37 -05:00
WayofTime 1115eaf9a7 Improved compression handler, updated buildings.zip, added temporary portal configs 2014-11-29 10:41:01 -05:00
WayofTime e92b83b627 Adding the new buildings 2014-11-27 15:59:34 -05:00
WayofTime 00f84744ee Merge pull request #162 from qianzha/patch-9
Update zh_TW.lang(v1.2.1a)
2014-11-24 17:21:42 -05:00
qianzha 32a668c122 Update zh_TW.lang 2014-11-23 16:36:36 +08:00
qianzha 09261ceee3 Update zh_CN.lang 2014-11-23 16:34:47 +08:00
WayofTime 5224b808c3 Fixing compression glitches 2014-11-20 10:49:21 -05:00
WayofTime 174d56b8ff Finishing up Compression sigil 2014-11-20 10:19:45 -05:00
WayofTime dbe51d7f7b Added Rune of Acceleration 2014-11-18 15:49:42 -05:00
WayofTime b3199cfb19 Added Harvest Goddess Sigil, fixed Water and Lava sigils so they actually place their fluids (derp) 2014-11-18 15:29:31 -05:00
WayofTime ad3289d080 Updated Sanguine Armour textures, added Blood Letter's Pack texture, fixed API imports. 2014-11-17 18:33:11 -05:00
WayofTime 6ad0d3b702 Changed a few things. Waiting for xcomp to help fix my work environment 2014-11-15 16:17:51 -05:00
ganymedes01 02db97e5a5 Animated the blood on altars 2014-11-14 21:04:54 -02:00
ganymedes01 c8f74029a4 Made blood look more like blood 2014-11-14 13:40:51 -02:00
WayofTime 51346b5638 Initial comment to start using Blood Utils' book 2014-11-03 18:05:28 -05:00
WayofTime d1fa088923 Added filled belljars to the creative tab 2014-11-02 14:41:52 -05:00
TehNut 2f9384220a Update buildscripts, re-add things that went missing, update mcmod.info 2014-10-31 17:50:25 -07:00
WayofTime a2b006105e Testing the creation of hell 2014-10-31 17:35:30 -04:00