aidancbrady
|
a5f4457677
|
Merge branch 'development' into 1.9.4
* development:
Update pt_BR.lang
Allow shift-right clicking machines with upgrades
Fixed NBT reference losses
Fixed Thermal Evaporation Controller computer integration
Add config option for transmitter alloy upgrades
Fixed transmitter crash, fixed entangloporter frequency issue, fixed PRC muffling upgrades
Conflicts:
src/main/java/mekanism/client/render/RenderPartTransmitter.java
src/main/java/mekanism/common/FluidNetwork.java
src/main/java/mekanism/common/item/ItemAlloy.java
src/main/java/mekanism/common/item/ItemUpgrade.java
src/main/java/mekanism/common/util/PipeUtils.java
|
2016-06-15 20:41:32 -04:00 |
|
aidancbrady
|
6340bb3cdc
|
Fixed NBT reference losses
|
2016-06-10 11:30:03 -04:00 |
|
aidancbrady
|
e1a5bf13c7
|
Fixed Thermal Evaporation Controller computer integration
|
2016-06-10 11:17:26 -04:00 |
|
aidancbrady
|
fa24e0e780
|
Isolate MDK, update build script. Gonna try to get this pushing to the dev server
|
2016-05-28 19:14:18 -07:00 |
|
aidancbrady
|
c9f8fd011e
|
Polished capabilities, still need to decide if we're allowed to ship capability references in API
|
2016-05-27 14:02:15 -04:00 |
|
aidancbrady
|
a89b8f666c
|
<200 errors. All I have left is a bit of rendering work and the new "off hand" stuff
|
2016-05-25 17:30:22 -04:00 |
|
aidancbrady
|
af008b9395
|
<1000 errors
|
2016-05-24 23:35:37 -04:00 |
|
aidancbrady
|
3983cc858b
|
Begin the great port. 2378 errors to go!
|
2016-05-24 20:04:40 -04:00 |
|
aidancbrady
|
c002ac6d8a
|
Glow Panels render in item form, use getEffectiveSide() instead of isRemote when checking packet security
|
2016-05-18 19:06:36 -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
|
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
|
98c57960d1
|
Got more CTM stuff rendering
|
2016-05-10 00:12:01 -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 |
|
Ben Spiers
|
0cb18773aa
|
Merge branch 'development' into 1.8.9
|
2016-04-25 16:08:06 +01:00 |
|
aidancbrady
|
5dcddaf25b
|
Fixed glass render, added new Thermal Evaporation Plant computer integration
|
2016-03-22 17:18:55 -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
|
34d55f72ea
|
More fluid container integration, removed dead code
|
2016-03-06 02:57:32 -05:00 |
|
aidancbrady
|
d332ad49b7
|
More consolidated fluid container management- I've been meaning to get to this for a long time
|
2016-03-06 02:15:56 -05:00 |
|
aidancbrady
|
b13d8ee1ab
|
Fixed fluid duplication
|
2016-03-05 18:48:49 -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 |
|
Ben Spiers
|
716aabece5
|
Fix merge
|
2016-02-20 22:58:17 +00: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 |
|