Anvilcraft/equivalent-exchange-3
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity
1573 commits 1 branch 0 tags 11 MiB
Commit graph

1573 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dynious
bd09f3e808 Fixed #626 with stack sizes > 1 2014-02-11 20:15:14 +01:00
pahimar
633658eedc Merge pull request #629 from Dynious/calcinatorFix 
Fixes #626
 2014-02-11 13:23:10 -05:00
Dynious
af8b2c32d8 Fixes #626 2014-02-11 19:21:49 +01:00
pahimar
c6b6b1f301 Add in missing IInventory method 2014-02-10 20:20:55 -05:00
pahimar
c7054f92d1 Fix Alchemical Chest/Bag gui texture paths 2014-02-10 20:20:36 -05:00
pahimar
9f8f286c67 https://github.com/pahimar/Equivalent-Exchange-3/issues/599 2014-02-10 20:14:13 -05:00
pahimar
09b07b460e Prevent Alchemical Bag GUI from being opened while it's inventory is being finished up 2014-02-10 20:12:09 -05:00
pahimar
683cde92fb Fixes #625 2014-02-10 20:10:31 -05:00
pahimar
96b6e1d1e4 Merge remote-tracking branch 'origin/master' 
Conflicts:
	src/main/resources/assets/ee3/textures/gui/alchemicalStorage_large.png
	src/main/resources/assets/ee3/textures/gui/alchemicalStorage_medium.png
	src/main/resources/assets/ee3/textures/gui/alchemicalStorage_small.png
 2014-02-10 20:03:18 -05:00
pahimar
ffc5a204f1 Updating some broken bag code 2014-02-10 20:02:38 -05:00
monster860
2feca6ac13 Fixed placing bell on aludel in creative mode removes item. 2014-02-05 18:33:48 -05:00
pahimar
8f32e2380d Merge pull request #620 from Dynious/aludelfix 
Fixes Aludel problem of #618
 2014-02-05 15:16:33 -05:00
Dynious
3601074945 Fixes Aludel problem of #618 2014-02-05 20:49:08 +01:00
pahimar
10378cfaec Fixes the missed texture renames (for the alchemical chest guis) 2014-02-05 14:37:45 -05:00
pahimar
75f12767d9 Fixes #617 and #618 2014-02-05 14:20:42 -05:00
pahimar
a3b0758b9f Cleaning up some old TODOs that I've finished 2014-02-01 22:01:57 -05:00
pahimar
4c57687968 Some recipes for the bags. THEY DO NOT HAVE WORKING INVENTORIES YET!!! Don't cry to me if they don't meet your expectations 2014-02-01 21:58:49 -05:00
pahimar
ab288a587d Added subtypes to Alchemical Bags, played with the texture a bit to visually distinguish the different types better (omg texture artists please help me) 2014-02-01 21:23:47 -05:00
pahimar
78d876e78b Infused wood logs are now "rotatable" 2014-02-01 18:40:16 -05:00
pahimar
3e2a9e3883 Updated how the Glass Bell renders its inventory in the TESR 2014-02-01 15:22:39 -05:00
pahimar
1e67db9399 Fix up how the Aludel sends/receives data on how to display the output stack contents in world in its TESR 2014-02-01 13:38:08 -05:00
pahimar
7d46311003 Update Aludel to render the contents of the output slot (and not the input slot) 2014-02-01 12:40:22 -05:00
pahimar
e8b63a28d6 RecipeAludel now supports OreDictionary input stacks. Also, added grouping (non-localized) to the EMC tooltip 2014-02-01 12:02:30 -05:00
pahimar
75dd447044 Added RecipesAludel support to RecipeRegistry, so that items can have their values assigned via DynEmc 2014-02-01 11:01:56 -05:00
pahimar
748f6ca593 Merge pull request #612 from Dynious/AludelRecipeFix 
Fixes Aludel consuming wrong amount of items
 2014-02-01 07:51:07 -08:00
RedmenNL
abd00dc200 Fixes Aludel consuming wrong amount of items 2014-02-01 15:10:19 +01:00
pahimar
bb5e20cd13 Bit of work on some stuff, super generic as always 2014-01-31 21:54:41 -05:00
pahimar
7a2c0c79c3 Merge pull request #608 from SpartaMercenary/master 
Tidied up the log and debug methods in LogHelper
 2014-01-31 18:22:37 -08:00
pahimar
076d17de2c Merge pull request #610 from Dynious/ParticleFix 
Fixes Aludel fire particle placing
 2014-01-31 18:21:01 -08:00
pahimar
771e95c756 Can shift click items with fuel values into the Input slot of the Aludel 2014-01-31 13:18:15 -05:00
RedmenNL
09a36126b0 Fixes Aludel fire particle placing 2014-01-31 15:26:52 +01:00
pahimar
810232cfe0 Fixes #609 2014-01-30 22:05:46 -05:00
pahimar
ca6b8cd560 Yay Aludel :) 2014-01-30 22:03:11 -05:00
Brian
70f6782788 Tidied up the log and debug methods in LogHelper 
Changed the manual null check and String conversion in LogHelper to the static String.valueOf() method, which automatically performs a null check and handles it appropriately. See [String.valueOf(Object)](http://docs.oracle.com/javase/7/docs/api/java/lang/String.html#valueOf(java.lang.Object\))
 2014-01-26 18:56:22 -05:00
pahimar
490c9342ba Merge pull request #596 from ganymedes01/master 
A simple way to assign EMC values
 2014-01-24 07:28:55 -08:00
pahimar
6301083b36 Merge pull request #603 from Dynious/NBTFix 
Fixed NBTTagged Itemstack crashing GSON (de)serialization
 2014-01-24 07:27:07 -08:00
pahimar
b8437deee4 Merge pull request #604 from Dynious/RecipeAludel 
Finished matches method in RecipeAludel
 2014-01-24 07:26:45 -08:00
pahimar
4bab928d27 Merge pull request #602 from Dynious/master 
Updated .gitignore to properly ignore all non-EE3 files
 2014-01-24 07:19:16 -08:00
pahimar
ccd5ebaefd Merge pull request #605 from Dynious/OreRecipeFix 
Fixed OreStack EMC values not being looked up properly
 2014-01-24 07:18:50 -08:00
RedmenNL
d3e6332d48 Fixed OreStack EMC values not being looked up properly 2014-01-24 11:39:11 +01:00
RedmenNL
c43c341412 Finished matches method in RecipeAludel 2014-01-23 20:28:13 +01:00
RedmenNL
048204c145 Fixed NBTTagged Itemstack crashing GSON (de)serialization 2014-01-23 19:16:26 +01:00
Dynious
eba8afcd99 Updated .gitignore to ignore all non-EE3 files 2014-01-22 21:45:08 +01:00
pahimar
eed4a7bdaa Work on getting the Aludel working - to be continued on my desktop 2014-01-19 11:18:16 -05:00
ganymedes01
ce2e33996d Update InterModCommsHandler.java 2014-01-17 15:17:42 +00:00
ganymedes01
b19b667bae Update InterModCommsOperations.java 2014-01-17 15:17:23 +00:00
pahimar
baf7d501a4 Fixes #592. Can't even remember why that was there in the first place 2014-01-16 16:51:15 -05:00
pahimar
71b9d9a184 Optimize some code, and fix up dust stack rendering (colour) once and for all 2014-01-16 11:21:28 -05:00
pahimar
20b23ee923 More work on getting the dusts rendering properly (using @psxlover's suggestion) 2014-01-13 14:47:39 -05:00
pahimar
4381b89b9f Merge pull request #574 from SoldierW518/patch-1 
Update ConfigurationSettings.java
 2014-01-13 06:18:18 -08:00