Tom Elfring
|
035ddfc801
|
More missing UUID changes
|
2017-04-26 19:24:48 +02:00 |
|
aidancbrady
|
6f2b84e547
|
Totally refactor frequencies to use UUIDs instead of player usernames
|
2017-04-24 14:15:43 -04:00 |
|
aidancbrady
|
6eb8e59f3c
|
Fix more ItemStack issues
|
2017-04-03 20:12:02 -04:00 |
|
aidancbrady
|
6a42eb64e3
|
Update to 1.11.2. Untested, still using outdated MCMP
|
2017-03-25 20:35:26 -04:00 |
|
aidancbrady
|
7b1da62553
|
Merge branch 'development' into 1.9.4
* development:
Update pt_PT and pt_BR
Creates pt_PT and updates pt_BR
Fixed break crash
Added configurable steam auto-output to Reactor Port
Conflicts:
src/main/java/mekanism/common/util/MekanismUtils.java
src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java
|
2016-07-04 18:49:07 -04:00 |
|
aidancbrady
|
fdc21d8de5
|
Fixed break crash
|
2016-07-03 02:07:14 -04:00 |
|
aidancbrady
|
b624309837
|
Merge branch 'development' into 1.9.4
* development:
Added Fluid Tank comparator support, fixed Gas Tank comparator support
Implement config option for operators to bypass security, added turbine dump/dump excess functionality
Fixed Tesseract and Flux Duct support
Updated IC2 API, fixed integration
Conflicts:
src/api/java/ic2/api/Direction.class
src/api/java/ic2/api/Direction.java
src/api/java/ic2/api/crops/CropCard.class
src/api/java/ic2/api/crops/CropCard.java
src/api/java/ic2/api/crops/ICropTile.class
src/api/java/ic2/api/crops/ICropTile.java
src/api/java/ic2/api/energy/prefab/BasicSink.class
src/api/java/ic2/api/energy/prefab/BasicSource.class
src/api/java/ic2/api/info/Info.class
src/api/java/ic2/api/item/IC2Items.class
src/api/java/ic2/api/item/ILatheItem.class
src/api/java/ic2/api/item/ILatheItem.java
src/api/java/ic2/api/network/NetworkHelper.class
src/api/java/ic2/api/network/NetworkHelper.java
src/api/java/ic2/api/recipe/RecipeInputFluidContainer.class
src/api/java/ic2/api/recipe/RecipeInputOreDict.class
src/api/java/ic2/api/recipe/Recipes.class
src/api/java/ic2/api/recipe/Recipes.java
src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java
src/main/java/mekanism/common/block/BlockMachine.java
src/main/java/mekanism/common/tile/TileEntityFluidTank.java
src/main/java/mekanism/common/util/SecurityUtils.java
src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java
src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java
|
2016-06-30 12:56:45 -04:00 |
|
aidancbrady
|
3b214376ba
|
Implement config option for operators to bypass security, added turbine dump/dump excess functionality
|
2016-06-30 12:25:20 -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 |
|
Ben Spiers
|
85c67666ad
|
Merge branch 'development' into 1.8.9
|
2016-05-01 23:57:29 +01:00 |
|
aidancbrady
|
fe99d25305
|
Add network layer to make security preferences persistent
|
2016-04-30 11:26:12 -04:00 |
|
Ben Spiers
|
8064beb0fc
|
Fix compile errors from merge
|
2016-04-25 17:47:54 +01:00 |
|
aidancbrady
|
67372d703e
|
Portable Teleporter remembers frequency, new side data functionality for blocks with non-configurable sides, fixed energy cubes not outputting up or down, fixed transmitter lighting
|
2016-03-31 20:17:00 -04:00 |
|
aidancbrady
|
a18da2ad27
|
Integrate security into more machines
|
2016-03-21 18:25:27 -04:00 |
|
aidancbrady
|
f904c8b80c
|
Start integrating security into all machinery. This is a very rough implementation, there's gonna be a lot of balance and corrections to make before release
|
2016-03-21 16:53:29 -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 |
|