Commit Graph
118 Commits
Author SHA1 Message Date
aidancbrady c73eef6be8 <400 errors 2016-05-25 10:10:47 -04:00
aidancbrady af008b9395 <1000 errors 2016-05-24 23:35:37 -04:00
aidancbrady c6a09b5658 <1500 errors 2016-05-24 21:22:39 -04:00
aidancbrady 3983cc858b Begin the great port. 2378 errors to go! 2016-05-24 20:04:40 -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 18bd17dafe Fixed Security Desk not invalidating 2016-05-22 03:29:01 -04:00
aidancbrady 566907ad0b GUI fixes, fixed Electrolytic Separator model- need to figure out why heavy water texture is acting weird 2016-05-17 16:25:09 -04:00
aidancbrady e308cd161b More rendering work. I can't figure out the deal with these generator resources, it's freaking me out 2016-05-17 01:11:39 -04:00
aidancbrady 481535fa11 Remove unnecessary models, fixed some missing texture errors, continued work on MekanismGenerators 2016-05-16 21:15:26 -04:00
aidancbrady 4205c55093 Start work on generator rendering, I'm gonna stick with ISBRH for now until I decide which models can be transitioned 2016-05-14 23:40:29 -04:00
aidancbrady 3b0bcc1e01 More generators work, still working out those errors 2016-05-12 23:16:09 -04:00
aidancbrady 59eca85008 Complete merge, fixed third person perspective, add Digital Miner overlay, clean up Energy Cube tier management 2016-05-12 00:35:39 -04:00
aidancbrady f51221f5ac Implemented custom resistance for Refined Obsidian 2016-05-11 23:56:25 -04:00
aidancbrady eea39a4845 Fixed glass shadows 2016-05-11 01:22:39 -04:00
aidancbrady 730ee4e450 Loads and loads of render work. I can see the light at the end of the tunnel
- Finished CTM
- BasicBlock item rendering
- Balloon item rendering
- Plastic Fence item rendering
- Started work on Portable Tank fluid item rendering
- Fixed Obsidian TNT and Bin rendering
2016-05-10 15:38:12 -04:00
aidancbrady 98c57960d1 Got more CTM stuff rendering 2016-05-10 00:12:01 -04:00
aidancbrady d8760b842f CTM work 2016-05-09 23:23:05 -04:00
aidancbrady ddfe83c495 Of course, the issue isn't on Minecraft's end, it has to do with Coord4D hashing. Coord4D no longer extends BlockPos to prevent hash issues 2016-05-09 21:07:18 -04:00
aidancbrady c6f3c162f9 More work 2016-05-09 19:59:16 -04:00
aidancbrady eba5f7e356 Work on TileEntity stuff. Details below.
I've added the method "Coord4D.safeTileGet()" which is likely going to be necessary in a lot of cases where duplicate TEs could be created- for some reason World.getTileEntity() fails to return the saved TileEntity fairly often.
2016-05-09 18:36:40 -04:00
aidancbrady fc7b185805 Attempt to fix tile entity persistence 2016-05-09 14:52:56 -04:00
aidancbrady 3b75d9ff1e Loads of work on CTM, work on fixing multi blocks 2016-05-09 00:10:54 -04:00
aidancbrady 251ab596f5 CTM work 2016-05-06 10:03:56 -04:00
aidancbrady 840af06f43 Fixed up some textures, start working on a CTM rewrite 2016-05-05 22:52:57 -04:00
Ben Spiers fc7fa7492e More models 2016-04-29 16:42:29 +01:00
Ben Spiers 8e3d08dfd3 Some rough model improvements (tiers not done) 2016-04-29 00:36:29 +01:00
Ben Spiers 8064beb0fc Fix compile errors from merge 2016-04-25 17:47:54 +01:00
Ben Spiers 0cb18773aa Merge branch 'development' into 1.8.9 2016-04-25 16:08:06 +01:00
aidancbrady 5b893a1a81 Fuelwood Heater textures 2016-04-23 20:26:01 -04:00
aidancbrady f645ced8cf Fixed orphaned TEs. I hope this never is an issue again 2016-04-23 19:35:34 -04:00
aidancbrady 9d50b8773b More fixes 2016-04-21 23:46:47 -04:00
aidancbrady 5c495de348 Fixed block placement checks 2016-04-21 23:36:02 -04:00
aidancbrady aeecb57978 Fixed internal multi blocks of Thermoelectric Boiler not updating 2016-04-17 23:12:33 -04:00
aidancbrady cc0766be48 Loads of new assets 2016-04-11 16:32:01 -04:00
aidancbrady bfb17d45f6 Reorganized assets 2016-03-23 08:52:03 -04:00
aidancbrady e6f4102087 New "InternalMultiblock" framework to allow for easier multiblock component management, added "hot" state to superheating elements 2016-03-22 19:29:18 -04:00
aidancbrady 5dcddaf25b Fixed glass render, added new Thermal Evaporation Plant computer integration 2016-03-22 17:18:55 -04:00
aidancbrady 9c480954e3 Polished security desk interface and machine interaction. Need to start integrating now, so far only complete in metallurgic infuser 2016-03-21 13:30:59 -04:00
aidancbrady 062671cdc4 Added security desk 2016-03-21 08:15:49 -04:00
Ben Spiers 84336ec4d1 Merge branch 'development' into 1.8.9
Huge merge with 202 conflicts, hopefully not *too* broken.
2016-03-18 04:24:19 +00:00
aidancbrady 38a68541c4 Tiered Bins, better tier management! 2016-03-16 21:41:55 -04:00
aidancbrady 155758398c Continued boiler work 2016-02-28 11:52:52 -05:00
aidancbrady 87438dcc7f Boiler work, added heat info tab, worked on polishing heat interactions among machines 2016-02-27 13:32:48 -05:00
aidancbrady 3c1496740c Tiered Gas Tanks and tiered Fluid Tanks! 2016-02-24 17:01:43 -05:00
Ben Spiers b08bca67d4 Merge branch 'v9' into 1.8.9 2016-02-20 22:19:34 +00:00
aidancbrady 84da514b54 Rename Solar Evaporation Plant to Thermal Evaporation Plant 2016-02-18 18:37:38 -05:00
Ben Spiers 5432e42bbc Merge branch 'v9' into 1.8.9 2016-02-18 19:48:52 +00:00
aidancbrady ff9bbdfde8 More boiler work 2016-02-13 18:59:42 -05:00
aidancbrady e23409e2a5 Move Pressure Disperser to main module; going to be shared by both turbine and boiler 2016-02-10 18:30:16 -05:00
Ben Spiers fce32c8820 Merge branch 'v9' into 1.8.9
That was fun.
2016-02-10 00:47:27 +00:00