Nick
|
dd8832e18f
|
Fix TileAlchemyArray registered name
|
2015-12-27 16:43:11 -08:00 |
|
Arcaratus
|
5dff08380d
|
Basic sigils implementation
|
2015-12-27 19:38:12 -05:00 |
|
WayofTime
|
ae85224003
|
Added a new circle for the binding array.
|
2015-12-27 15:44:56 -05:00 |
|
WayofTime
|
9640d95d6f
|
Finished fancifying the rendering for the binding circle.
|
2015-12-26 21:13:05 -05:00 |
|
Nick
|
e6a11c2e4f
|
Add a JEI description to the Altar Maker
|
2015-12-26 17:08:58 -08:00 |
|
Nick
|
d9bc1105d8
|
First attempt at AlchemyArrayCrafting JEI support
Does not work currently due to broken map lookups.
|
2015-12-26 16:50:22 -08:00 |
|
Nick
|
03847ad6d9
|
Committing the Ritual stuff
Incomplete. Ritual detection/rotation needs to be implemented. Currently hardcoded to a test ritual
|
2015-12-26 16:49:25 -08:00 |
|
WayofTime
|
9faae07131
|
Improved Alchemy circle animation for Binding ritual.
|
2015-12-26 17:18:31 -05:00 |
|
WayofTime
|
db5ab41728
|
Fancified the mock binding alchemy array. Need to work on angle math so that the path speed along the path is constant, not the angle.
|
2015-12-26 14:40:51 -05:00 |
|
WayofTime
|
d4ec4dec8e
|
Created initial mock binding ritual with the Alchemy arrays.
|
2015-12-26 10:32:53 -05:00 |
|
WayofTime
|
e918b5692c
|
Fix #514
|
2015-12-24 20:28:39 -05:00 |
|
WayofTime
|
3a59866475
|
Added a rotation effect to the array when it is "crafting" the item.
|
2015-12-23 22:30:13 -05:00 |
|
WayofTime
|
c54aa5d00e
|
Finished the infrastructure for Alchemy Array crafting. Updated some Utils so that they work more generally. Added the ability for a delay to be present for effects.
|
2015-12-23 20:19:06 -05:00 |
|
WayofTime
|
63c3853776
|
Generated the initial infrastructure for Alchemy Array effects, which includes crafting. Needs to be hooked into by TileAlchemyArray.
|
2015-12-23 18:45:47 -05:00 |
|
WayofTime
|
073830a785
|
Created initial AlchemyArray block which will be used in crafting. SightSigil array is used for testing purposes for rendering. Packets and changing the shown image need to be completed.
|
2015-12-23 15:20:26 -05:00 |
|
Nick
|
cce3d6b79a
|
Simpler way of obtaining items via API
|
2015-12-23 09:42:52 -08:00 |
|
Nick
|
61b2b293ba
|
Clean up some logging + protect against negative values in Altar Recipes
|
2015-12-23 09:41:59 -08:00 |
|
Nick
|
43f2bdd28a
|
Update JEI compat
Should need less of these in the future. The API is becoming much more stable.
|
2015-12-23 01:23:52 -08:00 |
|
Nick
|
1d7565553a
|
Apparently these assets never got pushed
|
2015-12-23 01:08:39 -08:00 |
|
WayofTime
|
4e063e24a0
|
Removed latent System.out and reformatted to an inferior format.
|
2015-12-22 21:05:47 -05:00 |
|
WayofTime
|
f1a3c5ee46
|
Fixed Orb filling and added the Weak Blood Orb as a fillable orb.
|
2015-12-22 21:03:00 -05:00 |
|
WayofTime
|
4145b2a11c
|
Performed initial cleaning to BloodAltar/TileAltar and migrated all logic from the Tile to the BloodAltar class.
|
2015-12-22 20:32:25 -05:00 |
|
TehNut
|
0f26cbedd7
|
Update JEI compat to latest
|
2015-12-14 01:07:22 -06:00 |
|
Nick
|
d51a908f6b
|
Update JEI compat
|
2015-12-03 17:12:50 -08:00 |
|
WayofTime
|
eaa6226861
|
Mostly finished the LivingArmour framework, which includes the upgrades and stat trackers.
|
2015-12-03 10:18:05 -05:00 |
|
Nick
|
13d9cb4b5a
|
Add registry for Binding rituals and add JEI support
|
2015-12-02 19:27:28 -08:00 |
|
WayofTime
|
a3b12cb7e2
|
Created framework for LivingArmour and the handling. Upgrade handling is not done.
|
2015-12-02 21:30:54 -05:00 |
|
Nick
|
42d6c4b59b
|
Whoops, forgot EtherealSlates
|
2015-12-02 16:28:07 -08:00 |
|
Nick
|
96d94721c4
|
Revamp altar to only use EnumAltarComponent
- Removes internal references in API
- Makes full use of the idea of the API
- No more special checks
|
2015-12-02 16:02:18 -08:00 |
|
Nick
|
6db9b51350
|
Altar now resets capacity correctly
|
2015-12-02 15:07:36 -08:00 |
|
Nick
|
72d4c5e135
|
Config for ICompatibility
|
2015-12-02 13:28:50 -08:00 |
|
Nick
|
349efbd510
|
Move PotionArray size to Constants
|
2015-12-02 01:43:51 -08:00 |
|
Nick
|
f35cef51bb
|
Update JEI compat
|
2015-12-02 00:55:52 -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
|
305b5e165f
|
Stop referencing deprecated method
|
2015-12-01 22:58:01 -08:00 |
|
Nick
|
26e3888004
|
Remove reference to sun.misc.Launcher
|
2015-12-01 21:59:07 -08:00 |
|
Nick
|
b97f7d81c4
|
Docs for NetworkHelper
|
2015-12-01 21:55:56 -08:00 |
|
Nick
|
c4e6f63ada
|
Cleanup javadoc and make it compile correctly
|
2015-12-01 21:14:26 -08:00 |
|
Nick
|
427fb25424
|
Remove event registration with deprecated FML bus
|
2015-11-30 21:48:19 -08:00 |
|
Nick
|
3200683b74
|
Wrong Nullable import
|
2015-11-29 17:38:15 -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 |
|
Arcaratus
|
225016e030
|
Finished the Altar
|
2015-11-29 19:04:50 -05:00 |
|
Nick
|
c086c23915
|
Fix TileEntities not ticking
|
2015-11-29 10:49:13 -08:00 |
|
Nick
|
ac29e593ba
|
Localize ritual stones
|
2015-11-29 01:32:52 -08:00 |
|
Nick
|
44a5063f0b
|
Sigils descriptions now correctly support formatting
|
2015-11-29 00:00:46 -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
|
6f96e200d2
|
Update to 1.8.8. It's stable enough, now
|
2015-11-28 23:51:41 -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 |
|
Arcaratus
|
08e7844df1
|
Merge branch '1.8-Rewrite' of https://github.com/WayofTime/BloodMagic into 1.8-Rewrite
|
2015-11-27 20:15:47 -05:00 |
|
Arcaratus
|
a6d329cf98
|
Altar works
|
2015-11-27 20:15:19 -05: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
|
a12c72092a
|
TileAltar now uses new SN methods
|
2015-11-22 14:02:56 -08:00 |
|
Nick
|
e0b073b8b7
|
Cleanup the SoulNetwork a bit.
Should work now?
|
2015-11-22 13:43:15 -08:00 |
|
Nick
|
352c6b9e5f
|
Remove the untested caps
They NPE :D
|
2015-11-21 10:36:02 -08:00 |
|
Nick
|
066d3a3f1b
|
Temporarily cap to 16 per meta
Will work on implementing automatic overflow handling (Creating a new block when all the meta is taken up)
|
2015-11-17 16:30:08 -08:00 |
|
Nick
|
9035f800e2
|
Easier handling of meta blocks
|
2015-11-17 15:52:31 -08:00 |
|
Nick
|
fb94914b91
|
Abstract altar inventory handling for usage elsewhere
|
2015-11-12 13:05:23 -08:00 |
|
Nick
|
9a6d8d6d60
|
Blood Letter's Pack + Coat of Arms
|
2015-11-11 10:45:46 -08:00 |
|
Nick
|
4b7ad55016
|
Fix TileAltar NBT saving
@Arcaratus, why did you rmove that?
|
2015-11-11 10:35:44 -08:00 |
|
WayofTime
|
94fbedd39e
|
Created ItemLivingArmour as a replacement for the Bound armour. Initial implementation completed.
|
2015-11-08 17:42:02 -05:00 |
|
Arcaratus
|
258e9a1108
|
Remove unnecessary ISigil implements
|
2015-11-07 21:45:03 -05:00 |
|
Arcaratus
|
0788bbd3b2
|
Remove unnecessary ISigil implements
|
2015-11-07 21:44:44 -05:00 |
|
Arcaratus
|
86fcd4808b
|
Finished Water, Lava, and Void sigils
Also added in bloodstone
|
2015-11-07 21:37:12 -05:00 |
|
Nick Ignoffo
|
5ec35fcd08
|
Merge pull request #494 from Arcaratus/1.8-Rewrite
Sacrificial commit
|
2015-11-07 09:09:42 -08:00 |
|
Nick
|
e9cbcd4bfb
|
Merge remote-tracking branch 'origin/1.8-Rewrite' into 1.8-Rewrite
|
2015-11-07 09:08:02 -08:00 |
|
Arcaratus
|
806f291d02
|
Fix spelling of 'incense'
|
2015-11-07 11:54:36 -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 |
|
Nick
|
b419e9aae9
|
The last of the Imperfect Rituals + Tile handles lightning
|
2015-11-05 19:58:43 -08:00 |
|
Nick
|
6fc22c170e
|
Lombokify
|
2015-11-03 10:44:08 -08:00 |
|
Nick
|
798d4b926c
|
Use a wrapper instead of ItemStacks for Altar recipes
|
2015-11-03 10:00:40 -08:00 |
|
Nick
|
e12c78877e
|
Fix recipe by stack lookup
|
2015-11-03 09:47:38 -08:00 |
|
Nick
|
ddcc1237e8
|
Inventories now don't NPE when broken
|
2015-11-03 09:11:39 -08:00 |
|
Nick
|
6a5f5356ce
|
Fix inventory tiles not saving inventory
|
2015-11-03 08:42:38 -08:00 |
|
Nick
|
bd564ee7cf
|
Should fix altar crashing
|
2015-11-03 08:31:34 -08:00 |
|
Nick
|
b1e8930c11
|
Rain imperfect ritual
|
2015-11-03 08:15:24 -08:00 |
|
Nick
|
fa1bb906d3
|
Cleanup
|
2015-11-03 08:09:16 -08:00 |
|
Nick Ignoffo
|
081698c6f9
|
Merge pull request #490 from Arcaratus/1.8-Rewrite
Finished the Altar
|
2015-11-03 07:35:50 -08:00 |
|
Nick
|
68fae8c321
|
Fix Ritual Registry crashing with more than one registered..
|
2015-11-03 07:35:14 -08:00 |
|
Arcaratus
|
ab60e5f3fe
|
Finished the Altar
|
2015-11-03 10:34:11 -05:00 |
|
Nick
|
ed515f5c80
|
Air Sigil
|
2015-11-02 19:57:48 -08: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 |
|
Arcaratus
|
4734f1207a
|
Merge branch '1.8-Rewrite' of https://github.com/WayofTime/BloodMagic into 1.8-Rewrite
Conflicts:
src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java
|
2015-11-02 21:35:23 -05:00 |
|
Arcaratus
|
75143520ed
|
Pre-emptive things
|
2015-11-02 21:30:28 -05:00 |
|
Nick
|
d285736ca9
|
Imperfect ritual system hopefully works correctly now
|
2015-11-02 18:00:48 -08:00 |
|
Nick
|
92bf7cc35b
|
Imperfect rituals work mostly now
Just need to figure out an issue with the config
|
2015-11-02 17:45:11 -08:00 |
|
Nick
|
3a0dcae59a
|
Fix startup possible crash issues
how did i never notice this?
|
2015-11-02 17:24:43 -08:00 |
|
Nick
|
b59bc9766e
|
Fix BlockRitualController's ItemBlock name
|
2015-11-02 15:55:17 -08:00 |
|
Nick
|
72041e936a
|
Altar renders now
|
2015-11-02 15:28:33 -08:00 |
|
Nick
|
5985be1cd0
|
Fix RitualController not rendering
|
2015-11-02 13:20:29 -08:00 |
|
Nick
|
1d52cb5e67
|
Remove Unnecessary methods from RitualHelper
Activation, updates, and stopping should all be handled within the tiles.
|
2015-11-02 12:49:53 -08:00 |
|
Nick
|
096ba02450
|
Refactor everything to WayofTime.bloodmagic.*
|
2015-11-02 12:39:47 -08:00 |
|
Nick
|
46742a73d1
|
Ritual work + Begin move of NetworkHelper (static) to SoulNetwork (instance)
|
2015-11-02 09:51:11 -08:00 |
|
Nick
|
afad5b0fd0
|
Some more ritual work + imperfect rituals
|
2015-10-31 17:58:47 -07: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
|
f3645a35fa
|
Forgot credits + change deletion ID
|
2015-10-30 17:02:10 -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
|
cb3412bc84
|
Forgot this for Divination Sigil
|
2015-10-29 22:06:43 -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
|
77ccc3a727
|
Divination Sigil
|
2015-10-29 22:05:00 -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
|
3994bbd842
|
Remove test stuff
|
2015-08-21 16:31:04 -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 |
|
Nick Ignoffo
|
e8cd503854
|
Create a utility for registering renders for Blocks/Items
Almost direct copypasta from [my project](https://github.com/TehNut/ResourcefulCrops/blob/1.8/src/main/java/tehnut/resourceful/crops/util/helper/RenderHelper.java). Allows you to simply register models for Items/Blocks for given Metadata's.
Call these from your ClientProxy in postInit. A working example can be seen [here](https://github.com/TehNut/ResourcefulCrops/blob/1.8/src/main/java/tehnut/resourceful/crops/proxy/ClientProxy.java#L21-L25) [[Items](https://github.com/TehNut/ResourcefulCrops/blob/1.8/src/main/java/tehnut/resourceful/crops/registry/ItemRegistry.java#L42-L52)] [[Blocks](https://github.com/TehNut/ResourcefulCrops/blob/1.8/src/main/java/tehnut/resourceful/crops/registry/BlockRegistry.java#L30-L34)].
Review this a bit more closely. I did it from the web editor and it may not have worked 100% correctly.
|
2015-08-02 01:41:36 -05:00 |
|
WayofTime
|
b005d80ebd
|
Fixed the model for the blood altar (by basically disabling it for now)
|
2015-07-31 20:42:17 -04:00 |
|
WayofTime
|
53eb3a16b0
|
Test commit
|
2015-07-31 17:21:08 -04:00 |
|
Arcaratus
|
556d747825
|
Merge branch 'bloodmagic1.8' of https://github.com/WayofTime/BloodMagic into bloodmagic1.8
|
2015-07-31 12:12:19 -04:00 |
|
Arcaratus
|
786cda06c2
|
Fixed
|
2015-07-31 12:11:44 -04:00 |
|
WayofTime
|
a70bb5c11e
|
TEBelljar
|
2015-07-31 11:48:52 -04:00 |
|
WayofTime
|
b4d5f85e4e
|
Revert "Re-refixed TEBelljar"
This reverts commit e242207d50 .
|
2015-07-31 11:46:05 -04:00 |
|
WayofTime
|
e242207d50
|
Re-refixed TEBelljar
|
2015-07-31 11:45:50 -04:00 |
|
WayofTime
|
91ad8debe2
|
Merge pull request #412 from Arcaratus/bloodmagic1.8
Finished all porting
|
2015-07-31 11:42:07 -04:00 |
|
Arcaratus
|
d528bdbbf8
|
Finished all porting
|
2015-07-31 11:35:05 -04:00 |
|
WayofTime
|
1bd90ff01c
|
Fixed TEBellJar calls (may need to be changed back again...)
|
2015-07-30 20:50:48 -04:00 |
|
Arcaratus
|
93e5e6cca6
|
Merge branch 'bloodmagic1.8' of https://github.com/WayofTime/BloodMagic into bloodmagic1.8
|
2015-07-30 17:29:08 -04:00 |
|
WayofTime
|
f009d58f74
|
Fixes
|
2015-07-30 17:24:46 -04:00 |
|
Arcaratus
|
a2c4f4b965
|
All the items !sigils
|
2015-07-30 17:24:20 -04:00 |
|
Arcaratus
|
d88cc2d79e
|
Finished ModItems
|
2015-07-30 15:53:50 -04:00 |
|
Arcaratus
|
a9507b3b68
|
Finished (almost) everything !items
|
2015-07-30 14:52:39 -04:00 |
|
Arcaratus
|
2472cad9f1
|
Merge branch 'bloodmagic1.8' of https://github.com/WayofTime/BloodMagic into bloodmagic1.8
|
2015-07-30 10:24:44 -04:00 |
|
Arcaratus
|
b2f7ec6030
|
Finished TileEntities
|
2015-07-30 10:21:53 -04:00 |
|
WayofTime
|
d0b15c29de
|
Made the Toggleable sigil to make it easier for toggle sigils. Will replace the NBT editing in the sigils.
|
2015-07-30 10:16:16 -04:00 |
|
WayofTime
|
230b44fe88
|
Finished all errors except for the sigils.
|
2015-07-30 09:31:16 -04:00 |
|
WayofTime
|
9e2c0e6e74
|
Fixed non-armour and non-sigil items
|
2015-07-30 08:44:01 -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 |
|
WayofTime
|
b14f2898e8
|
Fixed Block item renderers
|
2015-07-29 18:34:15 -04:00 |
|
WayofTime
|
b406b581a0
|
Temporarily removed Pam harvest handlers.
|
2015-07-29 18:17:50 -04:00 |
|
WayofTime
|
94b74fe309
|
Randoms.
|
2015-07-29 18:15:25 -04:00 |
|
WayofTime
|
800bf06872
|
Finished the old TESR's of the custom rendered blocks, will transition to .jsons when convenient.
|
2015-07-29 17:37:08 -04:00 |
|
WayofTime
|
977b6ce29d
|
Finished fixing the raw Tile altar, and finished the Omega structure.
|
2015-07-29 15:04:00 -04:00 |
|
WayofTime
|
cd5a52c7fb
|
Merge pull request #406 from Arcaratus/bloodmagic1.8
Add BlockRender code
|
2015-07-29 14:47:12 -04:00 |
|
WayofTime
|
dd07defe1f
|
Quick render stuff
|
2015-07-29 14:46:53 -04:00 |
|
Arcaratus
|
cfed9f5ab3
|
Add BlockRender code
|
2015-07-29 14:44:14 -04:00 |
|
WayofTime
|
ffd5a672cb
|
Merge pull request #405 from Arcaratus/bloodmagic1.8
Finished all Blocks
|
2015-07-29 14:38:47 -04:00 |
|
WayofTime
|
1aa343624e
|
Finished the rituals
|
2015-07-29 14:37:45 -04:00 |
|
Arcaratus
|
419f532502
|
Finished all Blocks
|
2015-07-29 14:35:00 -04:00 |
|
WayofTime
|
86b753d098
|
Finished almost all rituals.
|
2015-07-29 14:26:37 -04:00 |
|
WayofTime
|
1fbebc56a2
|
Merge pull request #404 from Arcaratus/bloodmagic1.8
Did ModBlocks
|
2015-07-29 11:34:46 -04:00 |
|
Arcaratus
|
e5abfd03e5
|
Did ModBlocks
|
2015-07-29 11:30:24 -04:00 |
|
WayofTime
|
f046b07a82
|
Reworked more rituals, allowed Int3 to be created from BlockPos - note for future, may replace Int3 with Vec3i for future use
|
2015-07-29 11:25:11 -04:00 |
|
Arcaratus
|
45e8c57ac9
|
Hope this works
|
2015-07-29 09:27:45 -04:00 |
|
Arcaratus
|
3578a431e8
|
Added CB Files
|
2015-07-29 09:20:39 -04:00 |
|
WayofTime
|
b090d154eb
|
Doing more cleanup
|
2015-07-29 09:15:43 -04:00 |
|
WayofTime
|
59b8ecc271
|
Fixed more issues
|
2015-07-29 09:08:46 -04:00 |
|
WayofTime
|
e9562e37cb
|
Started to continue the long process of fixing all the errors.
|
2015-07-29 08:59:13 -04:00 |
|
WayofTime
|
e812118b2e
|
Merge branch 'bloodmagic1.8' of https://github.com/WayofTime/BloodMagic
|
2015-07-29 08:27:38 -04:00 |
|
WayofTime
|
c5681dc831
|
Initial commit of BM 1.8
|
2015-07-29 08:23:01 -04:00 |
|
WayofTime
|
d99eadbea7
|
Test Commit
|
2015-07-29 07:44:03 -04:00 |
|
WayofTime
|
e5536872a9
|
Mild code cleanup after having to reclone the dev environment.
|
2015-07-29 07:34:41 -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 |
|
Arcaratus
|
f20d99628b
|
Merge branch 'master' of https://github.com/WayofTime/BloodMagic
|
2015-07-27 14:02:44 -04:00 |
|
Arcaratus
|
bc67bb8379
|
Added in #396 and gave the sword blocking
|
2015-07-27 14:02:32 -04:00 |
|
WayofTime
|
6470d91ff9
|
Fix #398, Fixed DemonPlacer so that it would spawn the demons with the owners.
|
2015-07-27 13:36:47 -04:00 |
|
WayofTime
|
79f86a3a37
|
Fixed the Dynamic Mace so that it looks at the material of the block as well.
|
2015-07-23 09:23:38 -04:00 |
|
WayofTime
|
b2c013e8c6
|
Disabled arm rendering for 1.3.3-11
|
2015-07-20 20:56:46 -04:00 |
|
WayofTime
|
87d8af95d7
|
Merge pull request #393 from Arcaratus/master
Fix Entities
|
2015-07-20 19:57:47 -04:00 |
|
Arcaratus
|
06df5f5e39
|
Fix Entities
|
2015-07-20 19:56:29 -04:00 |
|
WayofTime
|
8d7d587e01
|
Arm now renders over all layers.
|
2015-07-19 21:07:45 -04:00 |
|
WayofTime
|
724f09c130
|
More arm stuffs!
|
2015-07-19 19:06:22 -04:00 |
|
WayofTime
|
32e6539deb
|
More attempts at the armour rendering, and an attempt to fix the entities.
|
2015-07-19 17:01:18 -04:00 |
|
WayofTime
|
43c1386c78
|
Merge pull request #391 from qianzha/patch-10
Update zh_CN.lang (v1.3.3-4)
|
2015-07-19 16:17:58 -04:00 |
|
WayofTime
|
19ed528d13
|
Experimentation with rendering the armour of the player.
|
2015-07-19 14:44:12 -04:00 |
|
qianzha
|
e953f9e3eb
|
Update zh_CN.lang (v1.3.3-4)
|
2015-07-19 20:43:20 +08:00 |
|
WayofTime
|
bf068d1487
|
Fully fixed elementals.
|
2015-07-18 16:38:47 -04:00 |
|
Arcaratus
|
098d86596b
|
Merge branch 'master' of https://github.com/WayofTime/BloodMagic
Conflicts:
src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBoulderFist.java
|
2015-07-18 10:08:42 -04:00 |
|
WayofTime
|
ebad8a2e29
|
Changes to Demons
|
2015-07-18 10:05:23 -04:00 |
|
Arcaratus
|
461c2127be
|
Fixed Elemental Crash
|
2015-07-18 10:02:06 -04:00 |
|
WayofTime
|
d6a57ca644
|
Fix #169
|
2015-07-17 17:07:39 -04:00 |
|
WayofTime
|
375bfe4842
|
What were you doing here?
|
2015-07-17 12:57:07 -04:00 |
|
WayofTime
|
12765e865b
|
Fixed API calls.
|
2015-07-17 12:07:38 -04:00 |
|
WayofTime
|
9b7b419ec8
|
Arcaratus and Vanilla are derps.
|
2015-07-16 18:29:53 -04:00 |
|
WayofTime
|
1ca7795164
|
Merge pull request #387 from Arcaratus/master
Refixed the Dismantler
|
2015-07-16 09:48:08 -04:00 |
|
Arcaratus
|
74f4e4f224
|
Refixed the Dismantler
|
2015-07-16 09:46:30 -04:00 |
|
WayofTime
|
77ae114b02
|
Merge pull request #386 from Arcaratus/master
Fixed Ritual Dismantler
|
2015-07-16 09:31:56 -04:00 |
|
Arcaratus
|
2557e02018
|
Fixed Ritual Dismantler
|
2015-07-16 09:29:21 -04:00 |
|
WayofTime
|
1bbf76063c
|
Merge branch 'master' of https://github.com/WayofTime/BloodMagic
|
2015-07-13 17:37:03 -04:00 |
|
WayofTime
|
82244a357b
|
Removed useless shader class.
|
2015-07-13 17:36:53 -04:00 |
|
Arcaratus
|
2d6b1c4462
|
Add achievements
|
2015-07-13 14:25:10 -04:00 |
|
Arcaratus
|
0d9db7def1
|
Fix #381
|
2015-07-10 16:52:39 -04:00 |
|
Arcaratus
|
09b2c0cbd7
|
Redo Commit
|
2015-07-09 11:24:20 -04:00 |
|
Arcaratus
|
c607817bcd
|
Fix #373 and did #375
|
2015-07-09 11:17:55 -04:00 |
|
WayofTime
|
786498e615
|
Removed redundant book code.
|
2015-07-08 22:03:38 -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
|
3328c4db74
|
Fix #370, #367
|
2015-07-06 18:50:15 -04:00 |
|
Arcaratus
|
e5b795fddc
|
Performance Commit --Too lazy to do the Altar recipe
|
2015-07-02 11:05:07 -04:00 |
|
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 |
|