aidancbrady
|
6e0a63c3ee
|
Merge branch 'development' into 1.9.4
* development:
Better Structural Glass recipe
Fixed Portable Teleporter issue, fixed compounded Factory localization, add upgrades support to Solar Neutron Activator
Conflicts:
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/network/PacketPortableTeleporter.java
src/main/java/mekanism/common/tile/TileEntityFactory.java
src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java
|
2016-07-16 12:26:58 -04:00 |
|
aidancbrady
|
88ead85f0e
|
Fixed Portable Teleporter issue, fixed compounded Factory localization, add upgrades support to Solar Neutron Activator
|
2016-07-16 12:16:55 -04:00 |
|
aidancbrady
|
b77ca6ff0c
|
Revert "Remove deprecated gas API methods"
This reverts commit c5a414df37.
|
2016-06-30 01:03:13 -04:00 |
|
aidancbrady
|
c5a414df37
|
Remove deprecated gas API methods
|
2016-06-29 19:58:13 -04:00 |
|
aidancbrady
|
e6da7fdc9c
|
Update to latest Forge, use Capability standards. Need to port to new fluid system
|
2016-06-23 16:34:27 -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
|
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
|
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
|
be863a4289
|
Add Mekanism Shaped and Mekanism Shapeless recipe handlers, use ItemDataUtils to consolidate non-subtype-based NBT data into a single compound
|
2016-05-19 18:48:59 -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
|
571a14be17
|
Fixed continuous block updates, fixed Heavy Water texture
|
2016-05-18 11:19:00 -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
|
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 |
|
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
|
2e2f4ce390
|
Merge branch 'development' into 1.8.9
|
2016-04-29 16:52:22 +01:00 |
|
aidancbrady
|
16c7dc92af
|
More rendering fixes
|
2016-04-27 19:08:01 -04:00 |
|
Ben Spiers
|
0cb18773aa
|
Merge branch 'development' into 1.8.9
|
2016-04-25 16:08:06 +01:00 |
|
aidancbrady
|
a18da2ad27
|
Integrate security into more machines
|
2016-03-21 18:25:27 -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
|
87438dcc7f
|
Boiler work, added heat info tab, worked on polishing heat interactions among machines
|
2016-02-27 13:32:48 -05:00 |
|
Ben Spiers
|
7b4fefeb60
|
Fix some of the things that were broken, add more type-specs.
|
2016-02-08 22:46:06 +00:00 |
|
Ben Spiers
|
a27c9b6839
|
tile package done, except for TEDigitalMiner
|
2016-01-25 04:36:00 +00:00 |
|
Ben Spiers
|
4ef5840ff9
|
stackTagCompound -> getTagCompound()
|
2016-01-23 14:15:58 +00:00 |
|
Ben Spiers
|
a80f724cc2
|
Apply various common one-to-one replacements
More work on common too. network package now done.
|
2016-01-23 13:24:51 +00:00 |
|
Ben Spiers
|
4247ba136a
|
Fix compile errors in API package
|
2016-01-16 14:35:01 +00:00 |
|
Ben Spiers
|
4040a57a16
|
Oops
|
2015-07-28 18:53:29 +01:00 |
|
Aidan C. Brady
|
ca9ec78399
|
Make Laser Amplifier require an Advanced Induction Cell, fixed RF & EU display units
|
2015-03-24 08:46:41 -04:00 |
|
Ben Spiers
|
0064f09d8c
|
Backwards-compatibility for IGasHandler. #2267
|
2015-03-22 14:36:21 +00:00 |
|
Aidan C. Brady
|
93df96851a
|
Added remaining framework for gas/fluid tank handling, finished new configuration implementation for PRC and Chemical Injection Chamber
|
2015-03-08 18:24:21 -05:00 |
|
Aidan C. Brady
|
dd254ef326
|
Better NEI integration, fixed a major issue with the Chemical Washer recipe handler, finished off Solar Neutron Activator
|
2015-02-27 13:42:38 -05:00 |
|
Aidan C. Brady
|
84ab0ecb3f
|
Lasers now have fancy sound effects!
|
2015-02-27 01:57:54 -05:00 |
|
Aidan C. Brady
|
9c7831d07b
|
Work on reactor interface a tad, work on Solar Neutron Activator
|
2015-02-27 00:28:46 -05:00 |
|
Aidan C. Brady
|
c39e3d1c1f
|
More dropper work
|
2015-02-26 20:50:02 -05:00 |
|
Aidan C. Brady
|
7a1085d38d
|
More work
|
2015-02-26 17:36:24 -05:00 |
|
Aidan C. Brady
|
5767bfb22e
|
Work on Solar Neutron Activator and its recipe system
|
2015-02-26 17:23:53 -05:00 |
|
Aidan C. Brady
|
999502a053
|
Half-implemented Solar Neutron Activator
|
2015-02-25 11:11:30 -05:00 |
|