Matthias Mann
9ebf226762
fix 'Format error:' in Waila
2015-06-24 21:20:28 +02:00
Matthias Mann
4580a9c647
#2601 remember the containerItems list
2015-06-24 20:55:05 +02:00
tterrag1098
694a21dfac
Clean up vat icon handling, clean up buildscript
2015-06-23 21:30:49 -04:00
tterrag1098
8821e438f1
Add dependency replacing
2015-06-23 21:17:53 -04:00
tterrag1098
8a9991e1f2
Update endercore dep and add endercore as required-after
2015-06-23 15:54:51 -04:00
tterrag1098
4bd4e6bff1
Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO
...
Conflicts:
src/main/java/crazypants/enderio/TileEntityEio.java
src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java
src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java
src/main/java/crazypants/render/TechneModelRenderer.java
src/main/java/crazypants/render/TechneUtil.java
2015-06-23 15:43:26 -04:00
tterrag1098
dee9e2676a
Merge pull request #2590 from HenryLoenwind/techneFixes
...
Techne Rendering
2015-06-21 12:31:44 -04:00
tterrag1098
4ad7b364f7
Merge remote-tracking branch 'origin/master' into endercore
...
Conflicts:
src/main/java/crazypants/enderio/conduit/ConduitRecipes.java
src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java
src/main/java/crazypants/enderio/gui/IconButtonEIO.java
src/main/java/crazypants/enderio/machine/MachineRecipes.java
src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java
src/main/java/crazypants/enderio/machine/enchanter/GuiEnchanter.java
src/main/java/crazypants/enderio/machine/farm/FarmersRegistry.java
src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java
src/main/java/crazypants/enderio/material/MaterialRecipes.java
src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java
src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java
src/main/java/crazypants/gui/GuiContainerBase.java
src/main/java/crazypants/gui/GuiScreenBase.java
src/main/java/crazypants/gui/IGuiScreen.java
src/main/java/crazypants/gui/ToolTipManager.java
src/main/java/crazypants/util/FluidUtil.java
2015-06-21 12:29:39 -04:00
tterrag1098
2b0db0a543
#2597 Conduit Probe does not copy ender fluid conduit filter
2015-06-21 12:12:02 -04:00
tterrag1098
7dae561b89
Allow copying of any amount of filters
2015-06-21 12:02:29 -04:00
tterrag1098
a72f4063ab
Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git
2015-06-21 11:29:37 -04:00
tterrag1098
7eb77c5108
Attractor obelisk should call onUntracked when invalidated
2015-06-21 11:29:27 -04:00
tterrag1098
2cf2066724
#2594 Farming Station not displaying notification with stem farmer
2015-06-21 11:23:58 -04:00
Matthias Mann
4203014011
#2591 add some peaceful recipe alternatives
2015-06-17 22:46:52 +02:00
HenryLoenwind
832d3bd4f6
Techne Rendering
...
* Fixes problem with texture sizes (Forge bug)
* Implements a framework that allows easy rendering of only parts of
models.
* Changes telepad to use that.
2015-06-17 18:43:15 +02:00
HenryLoenwind
75b677a91d
Fix: Telepad multipart
...
* Allow coords to be set on any block of the multiblock, not just the
master
* Prevent maxPower to be 0
2015-06-17 17:33:08 +02:00
HenryLoenwind
fe3b56c924
Fix: Combustion Generator Input Tank Handling
...
* Combustion Generator Input Tank Handling wasn't implementing the
interface correctly, leading to NPEs
* re #2584
2015-06-17 01:46:44 +02:00
Matthias Mann
ae2c783e1e
#2584 don't crash on empty fluid containers
2015-06-14 22:29:38 +02:00
Matthias Mann
e3e3d26885
#2582 fix recipe typos
2015-06-14 11:55:25 +02:00
Matthias Mann
e49275235b
#2579 protect against blocks without a registered name, also compile the patterns just once
2015-06-13 08:32:19 +02:00
tterrag1098
dedd877af7
Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git
2015-06-12 19:06:10 -04:00
tterrag1098
4fa83c1114
#1668 Fix attractor obelisk behavior with endermen
2015-06-12 19:06:02 -04:00
Matthias Mann
b04213e165
add Storage Drawer API support for the Inventory Panel
2015-06-12 22:14:31 +02:00
tterrag1098
d98be8dd86
Massive recipe cleanup, everything should use oredict properly now
2015-06-12 14:35:12 -04:00
tterrag1098
70080d9acf
Fix power monitor automatically focusing on an invisible text box
2015-06-12 11:56:07 -04:00
tterrag1098
631af51f58
Third time's the charm, even better fix for #2557
2015-06-12 11:46:23 -04:00
tterrag1098
19134e706d
#2542 Fix painter source slot positioning
2015-06-12 11:35:06 -04:00
tterrag1098
69c39c3bb9
Better fix for tooltip issues ( #2557 )
2015-06-12 11:20:51 -04:00
tterrag1098
8345969bdd
Revert " #2557 only add the button tooltip to the GUI when the button had been added"
...
This reverts commit f7b64b8d7f .
2015-06-12 11:05:43 -04:00
tterrag1098
b6bd6dffaf
Fix enchanter GUI
2015-06-11 21:48:09 -04:00
MatthiasMann
2d9d8dc3e2
Merge pull request #2573 from MatthiasMann/invpanel_db_cleanup
...
cleanup DB slot tracking
2015-06-11 08:43:55 +02:00
Matthias Mann
f7b64b8d7f
#2557 only add the button tooltip to the GUI when the button had been added
2015-06-10 20:56:58 +02:00
Matthias Mann
57292ff004
cleanup DB slot tracking
2015-06-10 19:16:17 +02:00
tterrag1098
068339925f
Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git
2015-06-08 02:41:15 -04:00
tterrag1098
34c7f19f3a
Update CoFH API, implement IBlockAppearance
2015-06-08 02:41:03 -04:00
Matthias Mann
508e06323c
#2552 prevent endless loops in crafting
2015-06-07 19:00:54 +02:00
Matthias Mann
6f5f9651dc
don't crash for unnamed inventories or when the name contains special characters
2015-06-06 22:49:38 +02:00
tterrag1098
9aa903f196
Fix farm station GUI y size
2015-06-05 15:53:08 -04:00
tterrag1098
f24bf6b25c
This is done in the superclass...
2015-06-04 20:04:33 -04:00
tterrag1098
6d85216bdc
#2541 Crafter should post craft event, clean up fake player classes
2015-06-04 20:03:01 -04:00
tterrag1098
b42ade4226
Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git
2015-06-02 21:22:27 -04:00
tterrag1098
731bd624d3
Add Farming Station support for B0bGary's Growable Ores
...
Closes #2412
2015-06-02 21:21:53 -04:00
tterrag1098
ff81a3ed3a
Merge pull request #2491 from tgstyle/master
...
Fixed spelling, some grammar, and a lot of formatting
2015-06-02 20:14:55 -04:00
tgstyle
84343561ae
Fixed spelling, some grammer, and a lot of formatting
...
Formating, spelling changes to be consistent with the SAGMill xml
Formatting, spelling, and grammar to be consistent with other updated xml
Formatting, spelling, and grammar to be consistent with other xml
Update CrusherRecipeManager.java
Spelling, Formatting, grammar, and ignore nuggets on bonus
2015-06-02 16:41:45 -06:00
Matthias Mann
12c883c6fd
cleanup of powered spawner, don't show slots in capture mode
2015-06-02 23:56:33 +02:00
tterrag1098
e1ff548f86
Merge pull request #2486 from HenryLoenwind/replaceConduits
...
Replace Conduits
2015-06-02 17:04:02 -04:00
tterrag1098
75bc0f27b9
Merge remote-tracking branch 'origin/master' into endercore
...
Conflicts:
src/main/java/crazypants/enderio/BlockEio.java
src/main/java/crazypants/enderio/EnderIO.java
src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java
src/main/java/crazypants/enderio/conduit/ConduitUtil.java
src/main/java/crazypants/enderio/gui/IconButtonEIO.java
src/main/java/crazypants/enderio/gui/ToggleButtonEIO.java
src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java
src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java
src/main/java/crazypants/enderio/machine/invpanel/PacketGuiSettings.java
src/main/java/crazypants/enderio/material/ItemFusedQuartz.java
src/main/java/crazypants/enderio/waila/WailaCompat.java
src/main/java/crazypants/gui/GuiContainerBase.java
2015-06-02 16:27:52 -04:00
tterrag1098
f0e99dcd56
Fix NEI sync always being active
2015-06-02 13:03:56 -04:00
tterrag1098
a145405376
Fix rare class cast exception with conduit sound handling
2015-06-02 00:49:46 -04:00
mezz
398a26598c
Fix FluidFuelRegister addFuel from NBT
2015-05-31 13:36:22 -07:00