tterrag1098
12e8d6c191
#2609 Travel anchor GUI opening on client, also fix creative tab listing
2015-07-01 18:00:39 -04:00
tterrag1098
50877189a2
Fix dark steel repair not using oredict
2015-06-27 19:05:46 -04:00
Matthias Mann
f9c0d9d348
move magnet item singleton out of main class
2015-06-28 00:28:21 +02:00
MatthiasMann
ce4fc12b85
Merge pull request #2616 from MatthiasMann/more_format_fixes
...
a few more formatting fixes
2015-06-28 00:03:00 +02:00
Matthias Mann
7f2753e526
a few more formatting fixes
2015-06-28 00:02:27 +02:00
MatthiasMann
a69d38548c
Merge pull request #2615 from MatthiasMann/soulbinder_xp_cleanup
...
base all recipe starting condition on XP points instead of levels
2015-06-28 00:00:24 +02:00
Matthias Mann
8a025f5f6a
base all recipe starting condition on XP points instead of levels
2015-06-27 21:21:45 +02:00
tterrag1098
90492442ee
#2610 Fix keybinding behavior
2015-06-26 18:23:33 -04:00
tterrag1098
3cb46906eb
Add farming station support for IE's hemp
2015-06-26 13:55:03 -04:00
tterrag1098
8b7acbef9f
Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git
2015-06-25 14:10:21 -04:00
tterrag1098
ded9ca7647
Remove all jar, it's just not going to work
2015-06-25 14:08:47 -04:00
MatthiasMann
f4e821747d
Merge pull request #2608 from MatthiasMann/waila_format_errors
...
fix 'Format error:' in Waila
2015-06-24 21:21:07 +02:00
Matthias Mann
9ebf226762
fix 'Format error:' in Waila
2015-06-24 21:20:28 +02:00
MatthiasMann
a5ef5a1e49
Merge pull request #2607 from MatthiasMann/issue_2601
...
#2601 remember the containerItems list
2015-06-24 21:09:47 +02:00
Matthias Mann
4580a9c647
#2601 remember the containerItems list
2015-06-24 20:55:05 +02:00
tterrag1098
535f220f70
Use correct version number for endercore...
2015-06-23 21:34:57 -04: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
d878252fa9
Merge branch 'endercore'
2015-06-23 15:33:20 -04:00
tterrag1098
61727878fe
Update AE2 API to rv2stable9
2015-06-23 15:33:12 -04:00
tterrag1098
e38d94e50a
Remove debug change
2015-06-22 00:29:20 -04:00
tterrag1098
6848ccec85
Update buildscript to shade in EnderCore
2015-06-22 00:27:44 -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
MatthiasMann
1213b8e465
Merge pull request #2592 from MatthiasMann/issue_2591
...
#2591 add some peaceful recipe alternatives
2015-06-17 22:47:49 +02:00
Matthias Mann
4203014011
#2591 add some peaceful recipe alternatives
2015-06-17 22:46:52 +02:00
MatthiasMann
25f1632680
Merge pull request #2589 from HenryLoenwind/telepadFix
...
Fix: Telepad multipart
2015-06-17 19:14:08 +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
MatthiasMann
9f9d0cce3f
Merge pull request #2588 from HenryLoenwind/fluidFix
...
Fix: Combustion Generator Input Tank Handling
2015-06-17 07:42:06 +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
MatthiasMann
110d74ec36
Merge pull request #2585 from MatthiasMann/issue_2584
...
#2584 don't crash on empty fluid containers
2015-06-14 22:30:27 +02:00
Matthias Mann
ae2c783e1e
#2584 don't crash on empty fluid containers
2015-06-14 22:29:38 +02:00
MatthiasMann
b6f67c57e3
Merge pull request #2583 from MatthiasMann/issue_2582
...
Issue 2582
2015-06-14 11:56:44 +02:00
Matthias Mann
e3e3d26885
#2582 fix recipe typos
2015-06-14 11:55:25 +02:00
Matthias Mann
5dfd976d43
try to fix javadoc
2015-06-14 11:54:36 +02:00
MatthiasMann
65c73af23c
Merge pull request #2580 from MatthiasMann/issue_2579
...
#2579 protect against blocks without a registered name
2015-06-13 08:34:22 +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
MatthiasMann
4f95be7677
Merge pull request #2576 from MatthiasMann/invpanel_storagedrawers_api
...
add Storage Drawer API support for the Inventory Panel
2015-06-12 22:19:05 +02: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