aidancbrady
|
20bd989687
|
Merge branch 'development' into 1.8.9
* development:
Fixed packet security
Fixed 'other dust' registration
Better fake player reporting, thanks to @DraksterAU
Conflicts:
src/main/java/mekanism/common/item/ItemOtherDust.java
src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
src/main/java/mekanism/common/tile/TileEntityBasicBlock.java
src/main/java/mekanism/common/tile/TileEntityBasicMachine.java
src/main/java/mekanism/common/tile/TileEntityBin.java
src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java
src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java
src/main/java/mekanism/common/tile/TileEntityChargepad.java
src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java
src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java
src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java
src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java
src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java
src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
src/main/java/mekanism/common/tile/TileEntityDynamicTank.java
src/main/java/mekanism/common/tile/TileEntityElectricPump.java
src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java
src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
src/main/java/mekanism/common/tile/TileEntityFactory.java
src/main/java/mekanism/common/tile/TileEntityFluidTank.java
src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java
src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java
src/main/java/mekanism/common/tile/TileEntityGasTank.java
src/main/java/mekanism/common/tile/TileEntityInductionCell.java
src/main/java/mekanism/common/tile/TileEntityInductionPort.java
src/main/java/mekanism/common/tile/TileEntityInductionProvider.java
src/main/java/mekanism/common/tile/TileEntityLaser.java
src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java
src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java
src/main/java/mekanism/common/tile/TileEntityMultiblock.java
src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java
src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java
src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java
src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java
src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java
src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java
src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java
|
2016-05-17 14:23:57 -04:00 |
|
aidancbrady
|
7ae60615e2
|
Fixed packet security
|
2016-05-17 13:49:55 -04:00 |
|
aidancbrady
|
735106c25e
|
Begin work on MekanismGenerators
|
2016-05-12 15:07:54 -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
|
8b1017a3a8
|
Lots and lots of fancy rendering!
|
2016-05-11 17:42:51 -04:00 |
|
aidancbrady
|
374cc57515
|
Use new GlStateManager methods, got armor models to render (though the transformations seriously need to be updated)
|
2016-05-10 22:24:37 -04:00 |
|
Ben Spiers
|
0cb18773aa
|
Merge branch 'development' into 1.8.9
|
2016-04-25 16:08:06 +01:00 |
|
Ben Spiers
|
78c2afb5ea
|
Actually get it compiling again.
Seems to run ok, I think?
|
2016-04-25 13:11:26 +01:00 |
|
aidancbrady
|
e497a46bd6
|
Crash fix
|
2016-03-26 14:54:13 -04:00 |
|
aidancbrady
|
25866b39f9
|
Fixed fluid scaling issue
|
2016-03-26 13:28:48 -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 |
|
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
|
cfb0986a48
|
Added fancy graphs to display boil rate and max boil value of boilers, boiler valves now connect to corresponding tanks of multiblock based on location
|
2016-03-01 13:37:19 -05:00 |
|
aidancbrady
|
1071f2fb4d
|
Adjusted numbers, everything is now nice and balanced
|
2016-02-29 00:31:19 -05:00 |
|
aidancbrady
|
f09010a927
|
Many more fixes
|
2016-02-28 19:11:43 -05:00 |
|
aidancbrady
|
7c160cc264
|
Interface and rendering fixes
|
2016-02-28 18:11:50 -05:00 |
|
aidancbrady
|
c0f465d0cb
|
Boiler rendering and interface, still yet to do statistics
|
2016-02-28 16:44:05 -05: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
|
b3143d1abb
|
Thermodynamic Conductors function properly, added Thermal Evaporation Plant integration with heat system
|
2016-02-24 20:29:50 -05:00 |
|
aidancbrady
|
2d972edf45
|
Work on boilers
|
2016-02-24 17:42:12 -05:00 |
|
Ben Spiers
|
5432e42bbc
|
Merge branch 'v9' into 1.8.9
|
2016-02-18 19:48:52 +00: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 |
|