Commit Graph
110 Commits
Author SHA1 Message Date
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
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
tterrag1098 2508b9fba7 Merge remote-tracking branch 'origin/master' into endercore
Conflicts:
	src/main/java/crazypants/enderio/BlockEio.java
	src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java
2015-05-03 23:28:10 -04:00
tterrag1098 ac982993d7 Port tooltip system to EnderCore and fix IconButton rendering 2015-05-03 22:32:37 -04:00
tterrag1098 e5ca6d2485 #2416 Fix ClientProxy checking config settings in static init 2015-05-03 00:34:37 -04:00
tterrag1098 0dee1ee434 Porting more code over, switch to new IWidgetIcon system 2015-05-01 15:59:42 -04:00
tterrag1098 7bbadc67c5 Remove EnderCore code and port to using EnderCore 2015-04-29 22:47:32 -04: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
tterrag1098 adabb82f72 Move XP obelisk into proper package and refactor obelisks a bit 2015-04-12 04:37:32 -04:00
tterrag1098 79516999fe Refactor obelisk packages and some cleanup 2015-04-12 04:18:15 -04:00
tterrag1098 752342d15d Implement Mekanism v8 gas API, in the process move mek API to src/api 2015-03-22 16:39:41 -04:00
tterrag1098 8605d02f3e Partially implement telepad model 2015-03-20 00:09:39 -04:00
tterrag1098 510cf06738 More cleanup to techne rendering, implement the vat model 2015-03-18 10:53:52 -04:00
tterrag1098 c989340b02 Implement combustion gen model and add system for rotatable ISBRH models 2015-03-17 03:23:59 -04:00
tterrag1098 fca2a2fbfc Further implement techne model rendering. Implement farm model. 2015-03-16 23:46:51 -04:00
tterrag1098 96273cede4 Merge remote-tracking branch 'origin/master' into Telepad
Conflicts:
	src/main/java/crazypants/enderio/EnderIO.java
	src/main/java/crazypants/enderio/enderface/BlockEnderIO.java
	src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java
	src/main/java/crazypants/enderio/teleport/TravelEntitySpecialRenderer.java
	src/main/java/crazypants/gui/GuiContainerBase.java
	src/main/java/crazypants/gui/IGuiScreen.java
2015-02-26 11:33:42 -05:00
HenryLoenwind 5da6a47420 Added missing SideOnly annotations
* Added @SideOnly(Side.CLIENT) to methods that override methods that are
@SideOnly(Side.CLIENT).
* Added @SideOnly(Side.CLIENT) to classes that extend classes that are
@SideOnly(Side.CLIENT)
* Added @SideOnly(Side.CLIENT) to ClientProxy class
2015-02-18 02:18:53 +01:00
tterrag1098 0c105c7c78 Lots of telepad function/GUI work, add some rudimentary rendering 2015-02-16 00:11:52 -05:00
tterrag1098 35835e2fe4 Begin telepad. Has multiblock functionality, nothing else just yet.
Also externalize teleport API
2015-02-08 03:57:59 -05:00
tterrag1098 d836f76722 Finish weather obelisk functionality and add configs 2015-02-07 19:34:34 -05:00
tterrag1098 bbd305a0ab Merge remote-tracking branch 'origin/master' into Weather_Obelisk
Conflicts:
	resources/assets/enderio/textures/gui/widgets.png
	src/main/java/crazypants/enderio/gui/IconEIO.java
2015-02-07 17:24:27 -05:00
tterrag1098 3cb8da4e87 #1662 add interfaces to control hiding conduits and display modes 2015-01-23 13:33:04 -05:00
tterrag1098 938f5db503 Merge branch 'master' into Weather_Obelisk 2015-01-21 16:42:28 -05:00
Matthias Mann de2459696f move dark steel item instances into it's own statis class to solve class loading order dependencies 2015-01-21 22:13:18 +01:00
tterrag1098 045a04cc76 WIP Weather obelisk first pass 2014-12-30 10:21:50 -05:00
tterrag1098 ff4ef4ffd3 #32 Connected Photovoltaic Cells
- Have connected textures similar to cap banks
- Form a cohesive unit that gains and emites power as a whole
2014-12-27 20:42:29 -05:00
tterrag1098 313af94744 Merge branch 'master' into Buffer_Rendering
Conflicts:
	src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java
2014-12-26 21:52:25 -05:00
tterrag1098 4fda07f8d9 Fix obelisk item rendering being stuttery 2014-12-19 06:56:54 -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 78b6458fe9 Refactor Vat classes from still to vat package 2014-12-16 20:03:43 -05:00
tterrag1098 a1bce90bd6 Add basic item buffer. WIP. 2014-12-16 02:53:29 -05:00
CrazyPants 7efe4a6682 Added 'show range' button to Attractor Obelisk 2014-12-13 19:53:56 +08:00
CrazyPants c55a5b8209 New 'fill bar' rendering done. 2014-12-05 20:07:11 +08:00
CrazyPants 91370e20e7 Stubs in place 2014-12-02 15:32:16 +08:00
CrazyPants 04632dbc5f Added config option to disable Dimensional Transceiver 2014-11-27 12:51:45 +08:00
CrazyPants 1257afad5d #1157 Ender IO and Staff of Travelling bugs in Mystcraft Ages 2014-11-07 17:57:01 +08:00
tterrag1098 f6a9b0d845 Merge branch 'master' into AE2_MEConduits
Conflicts:
	build.gradle
	src/main/java/crazypants/enderio/conduit/IConduitBundle.java
	src/main/java/crazypants/enderio/conduit/TileConduitBundle.java
	src/main/java/crazypants/enderio/conduit/gas/GasConduitNetwork.java
	src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java
	src/main/java/crazypants/enderio/conduit/me/IMEConduit.java
	src/main/java/crazypants/enderio/conduit/me/MEConduit.java
	src/main/java/crazypants/enderio/conduit/me/MEConduitGrid.java
	src/main/java/crazypants/enderio/conduit/me/MEConduitRenderer.java
2014-11-04 22:06:52 -05:00
tterrag1098 9bc4e21c2f Fix item render 2014-11-01 23:48:39 -04:00
CrazyPants 315c926d0c Reverted merging of ME conduits. 2014-11-01 12:53:43 +08:00
tterrag1098 86330ff2af Use old ME conduit art 2014-10-31 23:20:06 -04:00
CrazyPants 15327417f3 Removed mobs from EnderIO, moved to new mod EnderZoo 2014-10-31 16:40:03 +08:00
CrazyPants 167d019738 Experience Obelisk now stores XP internally. Can still be extracted/inserted to/from liquidXP. 2014-10-19 19:53:47 +08:00
CrazyPants e03e7fab04 Added EnderCreeper (yes, it will be moved to a sperate mod) and added some enderminie config options. 2014-10-16 20:15:32 +08:00
CrazyPants b7f9cfb013 Started re-write of dim. trans. 2014-10-09 13:58:36 +08:00
CrazyPants 10d57c5da3 Added the Enderminy. 2014-10-07 23:55:32 +08:00
CrazyPants e75d98ca17 Added XP obelisk to use / drain liquid XP. 2014-09-14 22:56:44 +08:00
CrazyPants f13d44b278 Started work on Liquid XP support. 2014-09-13 21:59:10 +08:00
CrazyPants b74904c6be Aversion Oblisk is 'done' 2014-09-12 22:38:04 +08:00
CrazyPants 03fb6f0664 Added renderer for showing the range of the 'spawn guard' 2014-09-12 16:51:54 +08:00
CrazyPants 597d5225f3 Started work on renderer for attractor. 2014-09-12 00:50:59 +08:00