Commit graph

166 commits

Author SHA1 Message Date
pahimar 31aff45a72 Getting close with bags! 2014-03-26 21:01:54 -04:00
pahimar c3dd664629 Some more work on alchemical bag inventories 2014-03-25 21:59:36 -04:00
pahimar 5a6279eae9 Disable the blockl highlight handler for the transmutation stones until the transmutation system is in place 2014-03-22 17:29:53 -04:00
pahimar f3f9032715 ItemStacks that are damaged now have their EmcValue calculated properly from the undamaged one 2014-03-14 21:07:39 -04:00
pahimar ce822d0ebb Make it so you can "upgrade" existing Chests/Alchemical Chests with the Aludel 2014-03-11 21:09:52 -04:00
pahimar a7946fd8e6 Make it so you can "upgrade" existing Chests/Alchemical Chests with the Aludel 2014-03-11 20:22:19 -04:00
pahimar f5d2e4dbd0 Bit more work on the bag inventory, should be done tomorrow 2014-03-02 22:13:03 -05:00
pahimar 0980cf9101 Some divide by 0 protection in TileCalcinator 2014-03-02 13:12:50 -05:00
pahimar 3332bc75fd Prelim work on getting the bag inventories working 2014-02-24 22:13:56 -05:00
Dynious 3a71863dae Optimized getEmcValue and hasEmcValue 2014-02-24 16:27:44 +01:00
Dynious 42eb7336d6 Better handling of null WrappedStack input in RecipeMapping. 2014-02-14 14:06:23 +01:00
pahimar e07435ebca ISidedInventory support for the Aludel (similiar to @ganymedes01's PR https://github.com/pahimar/Equivalent-Exchange-3/pull/611) 2014-02-12 22:11:19 -05:00
pahimar 2638d355bf ISidedInventory support for the Calcinator (similiar to @ganymedes01's PR https://github.com/pahimar/Equivalent-Exchange-3/pull/611) 2014-02-12 20:49:34 -05:00
pahimar 566ef37060 Break out single item stack sizes from stack sizes > 1 2014-02-12 19:11:28 -05:00
pahimar 96e88d40d5 Fixes #632 2014-02-12 19:08:48 -05:00
pahimar 6cf9c0c20b Fixes #632 2014-02-12 18:47:56 -05:00
pahimar 933d5eb1b3 Merge pull request #635 from Dynious/CalcinatorSuck
Added sucking in items ontop of calcinator.
2014-02-12 18:40:32 -05:00
pahimar 8050ddadda Merge pull request #621 from monster860/master
Fixed placing glass bell on aludel in creative mode removing the item. Also, fixed glass bell rendering sideways for one tick when being placed.
2014-02-12 18:38:16 -05:00
Dynious 3eac68ad53 Added sucking in items ontop of calcinator. 2014-02-11 22:12:55 +01:00
Dynious bd09f3e808 Fixed #626 with stack sizes > 1 2014-02-11 20:15:14 +01: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 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
Dynious 3601074945 Fixes Aludel problem of #618 2014-02-05 20:49:08 +01: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