Commit graph

Select branches

Hide pull requests

1.11

1.12

1.12_bullied

1.14.4

1.15.2

1.16.3

1.16.3-Readme

1.7.10

1.8

1.9

3.0_rewrite

master

Mono Color

• fa1bb906d3 Cleanup Nick 2015-11-03 08:09:16 -0800
• 081698c6f9 Merge pull request #490 from Arcaratus/1.8-Rewrite Nick Ignoffo 2015-11-03 07:35:50 -0800
• 68fae8c321 Fix Ritual Registry crashing with more than one registered.. Nick 2015-11-03 07:35:14 -0800
• ab60e5f3fe Finished the Altar Arcaratus 2015-11-03 10:34:11 -0500
• ed515f5c80 Air Sigil Nick 2015-11-02 19:57:48 -0800
• ac5402df6b Cleanup Nick 2015-11-02 19:18:53 -0800
• ac588d0b15 Merge pull request #489 from Arcaratus/1.8-Rewrite Nick Ignoffo 2015-11-02 18:39:26 -0800
• 4734f1207a Merge branch '1.8-Rewrite' of https://github.com/WayofTime/BloodMagic into 1.8-Rewrite Arcaratus 2015-11-02 21:35:23 -0500
• 75143520ed Pre-emptive things Arcaratus 2015-11-02 21:30:28 -0500
• d285736ca9 Imperfect ritual system hopefully works correctly now Nick 2015-11-02 18:00:48 -0800
• 92bf7cc35b Imperfect rituals work mostly now Nick 2015-11-02 17:45:11 -0800
• 3a0dcae59a Fix startup possible crash issues Nick 2015-11-02 17:24:43 -0800
• b59bc9766e Fix BlockRitualController's ItemBlock name Nick 2015-11-02 15:55:17 -0800
• c10c0455be Merge remote-tracking branch 'origin/1.8-Rewrite' into 1.8-Rewrite Nick 2015-11-02 15:28:52 -0800
• 72041e936a Altar renders now Nick 2015-11-02 15:28:33 -0800
• f18d824c05 Updated .gitignore due to eclipse launch files in directory. WayofTime 2015-11-02 16:53:54 -0500
• 5985be1cd0 Fix RitualController not rendering Nick 2015-11-02 13:20:29 -0800
• 1d52cb5e67 Remove Unnecessary methods from RitualHelper Nick 2015-11-02 12:49:53 -0800
• 096ba02450 Refactor everything to WayofTime.bloodmagic.* Nick 2015-11-02 12:39:44 -0800
• 46742a73d1 Ritual work + Begin move of NetworkHelper (static) to SoulNetwork (instance) Nick 2015-11-02 09:51:11 -0800
• afad5b0fd0 Some more ritual work + imperfect rituals Nick 2015-10-31 17:58:47 -0700
• d5dc5bf328 Changed TEBelljar to TEBellJar WayofTime 2015-10-31 17:02:34 -0400
• d4a2bff7c2 Fiddling around after building -15. WayofTime 2015-10-31 16:57:45 -0400
• 3a7e0a3a8c Begin rituals + some refactoring Nick 2015-10-31 13:47:43 -0700
• 07b1f36594 Okay... They render now... Nick 2015-10-30 22:07:06 -0700
• b45172294d JSON models hurt my head Nick 2015-10-30 21:20:23 -0700
• f3645a35fa Forgot credits + change deletion ID Nick 2015-10-30 17:02:10 -0700
• 2bf78bc61c Divination Sigil no longer spams chat Nick 2015-10-30 16:54:59 -0700
• 09ff96fe03 Life Essence Nick 2015-10-29 22:22:08 -0700
• cb3412bc84 Forgot this for Divination Sigil Nick 2015-10-29 22:06:43 -0700
• 61365dc80f Use abstracted ModelLoader method in Orb Registry + Stop Orb JSON spam Nick 2015-10-29 22:06:18 -0700
• ce5e529135 Move old blockstates to old folder Nick 2015-10-29 22:05:48 -0700
• 77ccc3a727 Divination Sigil Nick 2015-10-29 22:05:00 -0700
• c701848011 Update README.md Nick Ignoffo 2015-10-29 20:33:40 -0700
• e3d4afa123 Rewrite is Go! Nick 2015-10-29 20:22:14 -0700
• 2a4e53714a Merge pull request #482 from TehNut/master WayofTime 2015-10-26 20:47:32 -0400
• b9390b2243 mcmod.info will now autoreplace version Nick 2015-10-26 16:39:28 -0700
• b38db9ae7a Swallow the NPE caused when other mods add recipes with null inputs Nick 2015-10-26 16:35:53 -0700
• 0764dd7be8 Merge pull request #473 from TehNut/patch-1 WayofTime 2015-10-18 06:57:49 -0400
• 3b1d3e968d Fix potential issue with reloading configs Nick Ignoffo 2015-10-17 19:11:26 -0700
• 6b15fb823f Merge pull request #468 from TehNut/master WayofTime 2015-10-12 16:46:05 -0400
• 6e54f83ebd Localize new commands + Add an Orb command Nick 2015-10-12 12:44:15 -0700
• 80b76a2dbb Add a "set" command for setting LP to a given amount Nick 2015-10-12 11:23:27 -0700
• 0cb0239276 Merge pull request #467 from Arcaratus/master WayofTime 2015-10-10 15:49:47 -0400
• 3793327f0c Added the utmost LP configs Arcaratus 2015-10-10 14:06:55 -0400
• 6b8942730c Added the utmost LP configs Arcaratus 2015-10-10 14:01:23 -0400
• a5eefd8bec Added the utmost LP configs Arcaratus 2015-10-10 14:00:38 -0400
• 0f7e2ba813 Merge pull request #466 from TehNut/master WayofTime 2015-10-09 20:29:35 -0400
• 185e461f13 Merge remote-tracking branch 'upstream/master' Nick 2015-10-09 17:27:00 -0700
• d259783ead Merge pull request #465 from Necr0/patch-1 WayofTime 2015-10-09 08:37:22 -0400
• 2099826500 API interface to add variant blocks to altar structure Nick 2015-10-08 23:57:04 -0700
• 40cb3a501a Fix all (known) instances of ugly 2D item model rendering Nick 2015-10-08 23:56:22 -0700
• 731f92a7fd Rework commands to be sub commands of /bloodmagic Nick 2015-10-08 23:56:00 -0700
• fa78706fca Allow Creative players to bypass Aura of Expulsion Nick 2015-10-08 23:55:26 -0700
• e9c5abf454 Fix Invisible Items Necr0 2015-10-08 04:20:19 +0200
• 9fb1f61a6a Merge pull request #464 from TehNut/master WayofTime 2015-10-07 18:55:51 -0400
• a91d350037 Altar now accepts Chisel variants of given blocks Nick 2015-10-06 23:04:39 -0700
• 83b26eb033 Fix my breakage of the altar checking Nick 2015-10-06 22:08:51 -0700
• 250debb604 Drastically improve the Teleposer Blacklist Nick 2015-10-06 20:38:01 -0700
• 4a86518366 Should fix getting free iron buckets from non-iron buckets Nick 2015-10-06 19:45:46 -0700
• bd4b2d2c52 Fix z-fighting of blood in altar when there is none Nick 2015-10-06 19:40:47 -0700
• 27ac16b5d2 Allow disabling of Weak Rituals Nick 2015-10-06 19:23:25 -0700
• 47849d4ab2 Merge pull request #463 from UndeadZeratul/Fix-Harvest-Levels WayofTime 2015-10-06 21:27:45 -0400
• fca3a60a1e Allow any instanceof BlockBeacon Nick 2015-10-06 18:24:12 -0700
• eaa20628ce Fix Bound Tool Harvest Levels UndeadZeratul 2015-10-06 18:45:24 -0500
• b2985550dc Merge pull request #449 from iambob314/patch-1 WayofTime 2015-10-04 18:42:18 -0400
• 277cd0742e Merge pull request #454 from Arcaratus/master WayofTime 2015-09-19 15:09:32 -0400
• 25209f78ed Merge branch 'master' of https://github.com/WayofTime/BloodMagic Arcaratus 2015-09-17 15:40:34 -0400
• 68babbca11 Added a package-info.java file Arcaratus 2015-09-17 15:39:54 -0400
• 5d94e59314 Actually default to Plains on too much biome skip iambob314 2015-09-09 19:02:46 -0400
• 3cf20bac43 Added more biome control in BiomeChanger ritual iambob314 2015-09-09 01:21:50 -0400
• f0e4d0feab Merge pull request #435 from Arcaratus/master WayofTime 2015-08-27 13:07:06 -0400
• a36c514b63 Fix TEBelljar and #433 Arcaratus 2015-08-27 13:02:14 -0400
• 8bdd1f8b8f Merge pull request #431 from Arcaratus/bloodmagic1.8 WayofTime 2015-08-24 17:34:00 -0400
• d15c4f2c8e JSON and the Arghhhh-onauts Arcaratus 2015-08-24 17:27:49 -0400
• cd34cb30e8 Fixed the routing focus texture name. WayofTime 2015-08-23 18:26:20 -0400
• 23bb71de31 Oops! WayofTime 2015-08-21 16:50:57 -0400
• 3994bbd842 Remove test stuff WayofTime 2015-08-21 16:31:04 -0400
• 9658ce06f7 A lot more .json files (4) WayofTime 2015-08-17 20:16:39 -0400
• 93d5f4ad83 Texturez (3) WayofTime 2015-08-12 17:24:45 -0400
• 010f9ec49c Moar .jsons (wow, that's a lot...) (2) WayofTime 2015-08-12 14:41:01 -0400
• 8006c87e06 Slowly adding the .jsons (1) WayofTime 2015-08-12 14:20:17 -0400
• 02c613d608 Merge pull request #423 from Arcaratus/master WayofTime 2015-08-12 08:35:11 -0400
• 245bfc96ca Merge branch 'master' of https://github.com/WayofTime/BloodMagic Arcaratus 2015-08-10 22:03:38 -0400
• 8896414a51 Vacation commit Arcaratus 2015-08-10 22:03:08 -0400
• 0aab0e6fc0 Merge pull request #416 from TehNut/patch-1 WayofTime 2015-08-03 22:00:21 -0400
• e8cd503854 Create a utility for registering renders for Blocks/Items Nick Ignoffo 2015-08-02 01:41:36 -0500
• b005d80ebd Fixed the model for the blood altar (by basically disabling it for now) WayofTime 2015-07-31 20:42:17 -0400
• 53eb3a16b0 Test commit WayofTime 2015-07-31 17:21:08 -0400
• 6f66d81d45 Fixed the gradles too. WayofTime 2015-07-31 12:15:46 -0400
• 6b0507931e Merge pull request #413 from Arcaratus/bloodmagic1.8 WayofTime 2015-07-31 12:13:39 -0400
• 556d747825 Merge branch 'bloodmagic1.8' of https://github.com/WayofTime/BloodMagic into bloodmagic1.8 Arcaratus 2015-07-31 12:12:19 -0400
• 786cda06c2 Fixed Arcaratus 2015-07-31 12:11:44 -0400
• 1aac4686db Attempt to fix repository WayofTime 2015-07-31 12:09:09 -0400
• a70bb5c11e TEBelljar WayofTime 2015-07-31 11:48:52 -0400
• b4d5f85e4e Revert "Re-refixed TEBelljar" WayofTime 2015-07-31 11:46:05 -0400
• e242207d50 Re-refixed TEBelljar WayofTime 2015-07-31 11:45:50 -0400
• 91ad8debe2 Merge pull request #412 from Arcaratus/bloodmagic1.8 WayofTime 2015-07-31 11:42:07 -0400
• d528bdbbf8 Finished all porting Arcaratus 2015-07-31 11:35:05 -0400
• 1bd90ff01c Fixed TEBellJar calls (may need to be changed back again...) WayofTime 2015-07-30 20:50:48 -0400