Commit Graph
74 Commits
Author SHA1 Message Date
tterrag1098 0c66f4ee56 Implement isAccessibleByPlayer where needed 2015-09-02 14:07:22 -04:00
tterrag1098 576199774f #2730 Switch all usage of MODID for textures to DOMAIN (lowercase) 2015-08-24 21:42:16 -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
Matthias Mann 8b9cd4a05e optimize canInsertItem 2015-05-24 13:39:53 +02:00
tterrag1098 6324c7ee69 Merge branch 'master' into endercore
Conflicts:
	src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java
	src/main/java/crazypants/enderio/config/Config.java
	src/main/java/crazypants/enderio/item/darksteel/PacketUpgradeState.java
	src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java
	src/main/java/crazypants/enderio/machine/PacketProgress.java
	src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java
	src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java
	src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java
	src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java
	src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java
	src/main/java/crazypants/enderio/machine/tank/TankFluidRenderer.java
	src/main/java/crazypants/enderio/machine/tank/TileTank.java
	src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java
	src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java
	src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java
	src/main/java/crazypants/gui/GuiContainerBase.java
	src/main/java/crazypants/util/BlockCoord.java
2015-05-20 10:35:59 -04:00
tterrag1098 6215e39410 Fix machine active state blinking in between successive tasks 2015-05-18 15:16:05 -04:00
tterrag1098 e1d60a5b19 Remove usage of 'localize(String, false)' in favor of localizeExact 2015-05-05 13:16:41 -04:00
tterrag1098 f3ac159c52 Switch to using non-static Lang class 2015-05-04 10:14:01 -04:00
tterrag1098 7bbadc67c5 Remove EnderCore code and port to using EnderCore 2015-04-29 22:47:32 -04:00
tterrag1098 bfa86203aa Merge pull request #2338 from HenryLoenwind/cleanup
Cleanup: null checks in doUpdate()
2015-04-28 15:43:05 -04:00
Matthias Mann d8d1e5a23a added Remote Awareness Upgrade, new sort icons created by ChJees 2015-04-20 05:05:42 +02:00
HenryLoenwind 30ac16d829 Cleanup: null checks in doUpdate()
They are not needed, the code calling doUpdate() would NPE if worldObj
was ever null at this point.
2015-04-19 11:21:57 +02:00
tterrag1098 57f665a03e Unify IProgressTile usage, only implement where needed.
Tons of cleanup everywhere, implement final methods in TileEntityEio
2015-04-12 06:02:29 -04:00
HenryLoenwind 191c5800fd Fix: Stack size limits on Farming Station
* The Farming Station's stack size limitations now actually work. Cases:
** Manual insert
** Shift-Click
** Pulling
** Pushing (e.g. item conduits)
** Harvesting
2015-03-20 19:45:13 +01:00
Henry Loenwind d7f9eb05fe Cleanup of common constructs 2015-03-18 21:44:48 +01:00
tterrag1098 c989340b02 Implement combustion gen model and add system for rotatable ISBRH models 2015-03-17 03:23:59 -04:00
tterrag1098 bf0bf98c21 Add a teleport active sound, fix Lang 2015-02-18 01:23:03 -05:00
tterrag1098 0c105c7c78 Lots of telepad function/GUI work, add some rudimentary rendering 2015-02-16 00:11:52 -05:00
Matthias Mann 28c919ee09 allow shift click on side config button to reset all sides to default 2015-02-07 09:59:59 +01:00
Matthias Mann d55d1b231d Fix buffer IO mode handling - #1627 2015-01-11 00:17:09 +01:00
hilburn 0286245a5e Added config. Line of Sight req for Killer Joe
checks front face and adjacent 2 sides for line of sight to target
before attacking
also ignores players in creative mode because that was just a waste of
nutrient
2015-01-03 03:20:57 +00:00
tterrag1098 b599663b1d #1506 Fix typo causing items to not be pushed from machines at all 2014-12-27 23:10:10 -05:00
tterrag1098 b4d5a88a75 Merge remote-tracking branch 'origin/master' into Buffer_Rendering
Conflicts:
	src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java
2014-12-17 20:27:17 -05:00
tterrag1098 a8d734ddbb Add IRedstoneConnectable to API to allow forced rs conduit connections 2014-12-16 03:50:19 -05:00
tterrag1098 a1bce90bd6 Add basic item buffer. WIP. 2014-12-16 02:53:29 -05:00
CrazyPants d4b5fd5a61 #1397 Completed refactor splitting machines into no powered, power receivers, power generators and power handlers (power in and out) 2014-12-14 18:49:38 +08:00
CrazyPants 26c8cf6c76 #1390 #1393 EIO machines and generators now implement only IEnergyReciver or IEnergyProvider instead of IEnergyHandler where appropriate 2014-12-13 15:55:54 +08:00
CrazyPants a2cec66a81 #1384 Disabling one side of machines disables the opposite side as well. 2014-12-12 14:09:32 +08:00
CrazyPants d1c9895494 Inventory, WAILA and item state done. 2014-12-04 14:23:23 +08:00
CrazyPants eed3d7b9af Added send/recieve item filters to the Dimensional Transceiver 2014-11-27 20:30:57 +08:00
tterrag1098 661e6e9637 Fix some machines showing power in WAILA when they shouldn't 2014-11-17 00:14:45 -05:00
tterrag1098 39132d781a More block update internalizing 2014-11-02 15:28:23 -05:00
tterrag1098 cffc5e51de Stirling gen needs to push items now 2014-10-29 18:35:57 -04:00
CrazyPants 2bb6084b33 #1107 Crash placing machine next to door 2014-10-16 13:55:34 +08:00
CrazyPants 05f7beb67f Slice'N and Splice'N 2014-09-05 04:13:58 +08:00
CrazyPants b703ce0175 Bug fixes. 2014-09-04 13:24:29 +08:00
CrazyPants 4e238ee9c4 Things are starting to work 2014-09-03 21:23:27 +08:00
CrazyPants 2866f4dd10 Started 2014-09-03 16:35:12 +08:00
tterrag1098 6e8beb73d4 Fixed server crashes...
- base TE now properly handles a null getSoundName()
- RL of sound is not client only
2014-08-11 00:25:20 -04:00
CrazyPants 06da4e3b8c ooops 2014-08-11 00:04:02 +08:00
CrazyPants 5b1ce7c2e0 Added config options for sounds.
Normalised volumes a bit between machines.
2014-08-10 20:56:43 +08:00
tterrag1098 345f1bc108 Switch sound system to use Strings instead of RLs 2014-08-10 03:24:21 -04:00
tterrag1098 752ab336e8 Fix crash on TE invalidate(), add Vat sounds. 2014-08-09 04:59:08 -04:00
tterrag1098 88b303b509 Add machine sounds base, add sound and change particles for stirling gen 2014-08-09 02:32:52 -04:00
tterrag1098 78109e2b7d Farm upgrades. Fix some power display bugs. Fix CME in Crafter. 2014-06-19 14:05:29 -04:00
CrazyPants 3182f4a4a8 More work on powered spawner. 2014-06-17 19:15:06 +08:00
CrazyPants a4bfc60b7d Initial work on powered spawner. 2014-06-16 23:05:52 +08:00
CrazyPants 20a2d2ac61 Some performance tweaks. 2014-06-16 13:03:09 +08:00
CrazyPants b4e64657e4 Fixed issues when day/night cycle disabled. 2014-06-10 15:15:27 +08:00
CrazyPants 4e8ef3f362 It compiles AND crashes a lot. Woohoo! 2014-06-05 17:40:15 +08:00