Commit Graph
3731 Commits
Author SHA1 Message Date
aidancbrady f04899e01c Transmitters render in item form, though I'd love to find a way to disable cull face for these item models 2016-05-24 19:22:59 -04:00
Ben Spiers aecb4ec3ab Merge branch '1.8.9' of github.com:aidancbrady/Mekanism into 1.8.9 2016-05-24 23:51:35 +01:00
Ben Spiers 51510bb101 Make glow panels brighter 2016-05-24 23:49:39 +01:00
aidancbrady fa46db4ce6 Removed unused mtl and obj commands, got heat network (and conductors) working with capabilities 2016-05-24 18:47:43 -04:00
aidancbrady 3bd0ff271c Remove traces of legacy transmitter rendering 2016-05-24 17:50:08 -04:00
aidancbrady 05c4967f0f Connected transmitter textures without any additional model groups, merely texture replacement and UV transformation 2016-05-24 17:32:12 -04:00
aidancbrady 6c8fec9e25 Logistical Transporters now render colored glass! Cannot contain excitement 2016-05-24 14:31:11 -04:00
aidancbrady 6eddd30478 Work on transmitter models, not working yet 2016-05-24 13:18:54 -04:00
aidancbrady c820c1ae86 Fixed block hardness, start work on a custom model implementation for transmitters to allow for color-tinted Logistical Transporters. @unpairedbracket, I won't interfere if you're working on the flush transmitter connection textures 2016-05-24 01:29:09 -04:00
aidancbrady d46e3e28b2 Cleanup, fixed transmitter wrench 2016-05-24 00:17:01 -04:00
aidancbrady f808b987f5 Logistical Transporters work & don't crash! 2016-05-23 21:09:18 -04:00
aidancbrady 60b9db3163 Implement BlockableConnection and HeatTransfer capabilities, fixed transporter connections 2016-05-23 20:32:12 -04:00
aidancbrady 273e89a3b2 Get gas API completely working with capabilities 2016-05-23 13:45:17 -04:00
aidancbrady b618263e69 Remove deprecated IGasHandler methods, properly implement AlloyInteraction and GasHandler capabilities 2016-05-23 12:44:05 -04:00
aidancbrady 4ddcb151a1 TileNetwork capability now working in full, fixed up Logistical Transporter packet management 2016-05-23 12:34:42 -04:00
aidancbrady 87910ba233 Fixed up some capability stuff 2016-05-23 00:38:04 -04:00
aidancbrady 7ded539fb1 Merge branch '1.8.9' of https://github.com/aidancbrady/Mekanism into 1.8.9
# By Ben Spiers
# Via Ben Spiers
* '1.8.9' of https://github.com/aidancbrady/Mekanism:
  Fix glow panel models on texture rebake
  Properly generify some things
2016-05-23 00:23:36 -04:00
aidancbrady bfba299456 Fixed transmitter data request, internal rendering now works on world load 2016-05-23 00:23:32 -04:00
Ben Spiers 55fe80e87e Merge branch '1.8.9' of github.com:aidancbrady/Mekanism into 1.8.9 2016-05-23 01:20:36 +01:00
Ben Spiers 48a493a2a0 Fix glow panel models on texture rebake 2016-05-23 01:19:37 +01:00
Ben Spiers 5ca5288736 Properly generify some things 2016-05-23 00:39:34 +01:00
aidancbrady bc1f428050 (Hopefully) fixed transmitter connections on world load 2016-05-22 19:14:45 -04:00
aidancbrady 8954baac9f Fixed Mechanical Pipe internal rendering, add Diversion Transporter and Restrictive Transporter rendering 2016-05-22 18:52:12 -04:00
aidancbrady c8f3fcaee1 Merge branch 'development' into 1.8.9
* development:
  Fixed Energy Cube output, fixed multiblock max size, fixed Electric Pump heavy water pumping
  Fixed Security Desk not invalidating

Conflicts:
	src/main/java/mekanism/common/block/BlockBasic.java
	src/main/java/mekanism/common/multiblock/UpdateProtocol.java
2016-05-22 18:42:56 -04:00
aidancbrady 9c1fe98619 Add in the missing resources for the remaining transmitters. @unpairedbracket, do you have any ideas for the colored glass of transporters? 2016-05-22 18:32:12 -04:00
aidancbrady 1e0d04ab2b Fixed Energy Cube output, fixed multiblock max size, fixed Electric Pump heavy water pumping 2016-05-22 17:58:25 -04:00
aidancbrady 18bd17dafe Fixed Security Desk not invalidating 2016-05-22 03:29:01 -04:00
aidancbrady 6c851365b9 Merge branch '1.8.9' of https://github.com/aidancbrady/Mekanism into 1.8.9
# By Ben Spiers
# Via Ben Spiers
* '1.8.9' of https://github.com/aidancbrady/Mekanism:
  Fix a slight error in the large transmitter blend
2016-05-22 01:51:54 -04:00
aidancbrady 001c9a8d09 A few minor improvements, need to sort out capabilities for gas network 2016-05-22 01:51:48 -04:00
Ben Spiers 14831101e4 Merge branch '1.8.9' of github.com:aidancbrady/Mekanism into 1.8.9 2016-05-21 22:40:05 +01:00
Ben Spiers f395fbab5e Fix a slight error in the large transmitter blend 2016-05-21 22:37:17 +01:00
aidancbrady f982aa84e9 Merge branch '1.8.9' of https://github.com/aidancbrady/Mekanism into 1.8.9
# By Ben Spiers
# Via Ben Spiers
* '1.8.9' of https://github.com/aidancbrady/Mekanism:
  Add "flip-v": true to basic unicable blockstate file. This fixes upside-down textures. Needs to be done for all of the transmitters but I can't be bothered right now.
2016-05-21 16:10:54 -04:00
Ben Spiers 8e9f2e65ac Add "flip-v": true to basic unicable blockstate file.
This fixes upside-down textures. Needs to be done for all of the transmitters but I can't be bothered right now.
2016-05-21 20:39:43 +01:00
aidancbrady d5656b0264 Merge branch 'development' into 1.8.9
* development:
  Fixed Turbine Stats crash
  Fixed Turbine container crash
  Bumped version, fixed Steel Casing recipe, fixed erratic heat behavior, fixed Turbine render crash, added missing localization, fixed Bin crafting crash
  ja_JP.lang - translate generators and ores tooltip, fix some entries
  ja_JP.lang - translate general machinery and Blocks(without ores) tooltip.
  ja_JP.lang - little fix/change
  ja_JP.lang - fix/change some entries
  ja_JP.lang - translate tooltip and gui text
  ja_JP.lang - gui and tooltip translation progress
  ja_JP.lang - fix/change some translation(items and blocks)
  ja_JP.lang tweak some entries based on v9

Conflicts:
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/util/RecipeUtils.java
2016-05-21 15:31:26 -04:00
Ben Spiers aeb00143a2 Merge branch '1.8.9' of github.com:aidancbrady/Mekanism into 1.8.9 2016-05-21 20:09:56 +01:00
Ben Spiers b8b2fd46e1 Get most of the transmitters rendering properly 2016-05-21 20:09:20 +01:00
aidancbrady e208ddc82d Fixed Turbine Stats crash 2016-05-21 14:01:34 -04:00
aidancbrady cf3dc591e0 Fixed Turbine container crash 2016-05-21 13:58:09 -04:00
aidancbrady ffd39dc20d Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
# By karakufire
# Via Aidan (1) and karakufire (1)
* 'development' of https://github.com/aidancbrady/Mekanism:
  ja_JP.lang - translate generators and ores tooltip, fix some entries
  ja_JP.lang - translate general machinery and Blocks(without ores) tooltip.
  ja_JP.lang - little fix/change
  ja_JP.lang - fix/change some entries
  ja_JP.lang - translate tooltip and gui text
  ja_JP.lang - gui and tooltip translation progress
  ja_JP.lang - fix/change some translation(items and blocks)
  ja_JP.lang tweak some entries based on v9
2016-05-21 13:52:34 -04:00
aidancbrady 0e0f9584f3 Bumped version, fixed Steel Casing recipe, fixed erratic heat behavior, fixed Turbine render crash, added missing localization, fixed Bin crafting crash 2016-05-21 13:52:28 -04:00
Aidan 711fa80ed8 Merge pull request #3227 from karakufire/loc_ja-JP
Update ja-JP.lang for v9
2016-05-21 12:46:31 -04:00
aidancbrady b812330338 Remove printlns 2016-05-21 12:32:32 -04:00
aidancbrady 38b4dab585 Merge branch '1.8.9' of https://github.com/aidancbrady/Mekanism into 1.8.9
# By Ben Spiers
# Via Ben Spiers
* '1.8.9' of https://github.com/aidancbrady/Mekanism:
  Fix some gradle deps and stuff
  Transmitter Render Work OBJ models are really nice to work with
2016-05-21 12:31:44 -04:00
aidancbrady 5249c0b6c8 Add content renderers for the rest of the transmitters, everything works as far as I can see but for some reason it takes a block update to actually start calling the special renderers 2016-05-21 12:31:36 -04:00
Ben Spiers ffb114e11c Merge branch '1.8.9' of github.com:aidancbrady/Mekanism into 1.8.9 2016-05-21 14:21:49 +01:00
Ben Spiers 901fbb5fd2 Fix some gradle deps and stuff 2016-05-21 14:21:28 +01:00
Ben Spiers 30510efaaa Transmitter Render Work
OBJ models are really nice to work with
2016-05-21 14:21:11 +01:00
aidancbrady 7b21d0511a After much tedious work, managed to get universal cable contents to render. All the rest should now be pretty easy. 2016-05-21 02:40:59 -04:00
aidancbrady dff7e68916 Start messing around with transmitter special rendering. Still can't see anything 2016-05-20 15:57:13 -04:00
karakufire 5bd1882b1f ja_JP.lang - translate generators and ores tooltip, fix some entries 2016-05-21 04:09:49 +09:00