Commit Graph
3843 Commits
Author SHA1 Message Date
aidancbrady 53353cd050 Fixed IC2 support (still may crash without), begin adding Tesla support 2016-07-01 11:05:02 -04:00
aidancbrady e2a93b5de1 Bump README version 2016-06-30 13:11:24 -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 41ea222aab Added Fluid Tank comparator support, fixed Gas Tank comparator support 2016-06-30 12:45:15 -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 8f8f1751ec Fixed Tesseract and Flux Duct support 2016-06-30 11:14:21 -04:00
aidancbrady 0b9a71162a Updated IC2 API, fixed integration 2016-06-30 11:07:52 -04:00
aidancbrady 202f917345 Begin porting fluid items 2016-06-30 10:41:55 -04:00
aidancbrady cbf109fe55 Merge branch 'development' into 1.9.4
* development:
  Revert "Remove deprecated gas API methods"
  Reactor Ports now auto-eject steam
  Remove deprecated gas API methods

Conflicts:
	src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java
2016-06-30 01:11:44 -04:00
aidancbrady b77ca6ff0c Revert "Remove deprecated gas API methods"
This reverts commit c5a414df37.
2016-06-30 01:03:13 -04:00
aidancbrady 425b43a4c4 Reactor Ports now auto-eject steam 2016-06-30 00:46:02 -04:00
aidancbrady c5a414df37 Remove deprecated gas API methods 2016-06-29 19:58:13 -04:00
aidancbrady ea544ff3ac Fixed fluids. Yay! Still need to update Reactor Port and item handling 2016-06-29 19:50:52 -04:00
aidancbrady ca7345aecc Merge branch '1.9.4' of https://github.com/aidancbrady/Mekanism into 1.9.4
* '1.9.4' of https://github.com/aidancbrady/Mekanism:
  A few fixes
  More fluid upgrading. TileEntity integration is about done
  Loads of work on new fluid system. Still needs polishing

Conflicts:
	src/main/java/mekanism/common/tile/TileEntityBoilerValve.java
	src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java
	src/main/java/mekanism/common/tile/TileEntityDynamicValve.java
	src/main/java/mekanism/common/tile/TileEntityElectricPump.java
	src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java
	src/main/java/mekanism/common/tile/TileEntityFluidTank.java
	src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java
	src/main/java/mekanism/common/tile/TileEntityPRC.java
	src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java
	src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java
	src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java
	src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
	src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java
2016-06-29 12:27:09 -04:00
aidancbrady 08700a82e7 Improved fluid handling 2016-06-29 12:26:34 -04:00
aidancbrady ca108a0999 A few fixes 2016-06-29 11:50:50 -04:00
aidancbrady 3973c70feb More fluid upgrading. TileEntity integration is about done 2016-06-29 11:18:08 -04:00
aidancbrady 6d02ea682b Loads of work on new fluid system. Still needs polishing 2016-06-29 10:32:11 -04:00
Ben Spiers b8f3a3e0b2 Prevent Mechanical pipes from crashing on placement 2016-06-29 03:50:59 +01:00
Ben Spiers 8477d0e756 Update forge version to latest recommended. Fixes #3421 2016-06-29 00:02:13 +01:00
Aidan 526bf8482c Merge pull request #3416 from karakufire/1.9.4 2016-06-28 11:31:33 -04:00
karakufire e00318b9ba Update ja_JP.lang 2016-06-28 13:48:10 +09:00
aidancbrady 7ed52d9376 Merge branch 'development' into 1.9.4
* development:
  Finished czech localization
  847/1085
  797/1085
  636/1085
  602/1085
  508/1085
  Revert "Revert "114/1085 translations completed""
  Revert "114/1085 translations completed"
  114/1085 translations completed
  Update ja-JP.lang
  Added czech localization file
2016-06-27 19:59:35 -04:00
aidancbrady 163e37de86 Merge branch 'master' into development
* master:
  Finished czech localization
  847/1085
  797/1085
  636/1085
  602/1085
  508/1085
  Revert "Revert "114/1085 translations completed""
  Revert "114/1085 translations completed"
  114/1085 translations completed
  Added czech localization file
2016-06-27 19:57:27 -04:00
aidancbrady 6086bc9f53 Begin transitioning to new fluid system, doesn't exactly work yet 2016-06-27 19:56:53 -04:00
Aidan 0594dede1e Merge pull request #3415 from freemanovec/master
Finished Czech localization
2016-06-27 19:56:28 -04:00
Aidan 02af729175 Merge pull request #3409 from karakufire/development
Update ja-JP.lang
2016-06-27 19:56:19 -04:00
Jakub Rohla 09fa8f9f5a Finished czech localization 2016-06-27 20:32:20 +02:00
Jakub Rohla 961c84304e 847/1085 2016-06-27 20:04:06 +02:00
Jakub Rohla e320616c37 797/1085 2016-06-27 17:42:02 +02:00
Jakub Rohla 15804b0b96 636/1085 2016-06-27 14:29:44 +02:00
Jakub Rohla 04e3fa195c 602/1085 2016-06-27 14:20:57 +02:00
Jakub Rohla 546dd1e9d5 508/1085 2016-06-27 13:54:28 +02:00
Jakub Rohla 8b335bdc04 Revert "Revert "114/1085 translations completed""
This reverts commit 1c6b74d854.
2016-06-27 07:08:16 +02:00
Jakub Rohla 1c6b74d854 Revert "114/1085 translations completed"
This reverts commit 9bc65d4593.
2016-06-27 07:07:53 +02:00
Jakub Rohla 9bc65d4593 114/1085 translations completed 2016-06-27 07:07:02 +02:00
karakufire 2358c22fa8 Update ja-JP.lang 2016-06-27 11:45:45 +09:00
aidancbrady d70efc5cc7 Fixed Digital Miner 2016-06-26 16:11:20 -04:00
aidancbrady 24377545ba Merge branch 'development' into 1.9.4
* development:
  Fixed heat displays
2016-06-26 15:51:09 -04:00
aidancbrady 8a166e108a Fixed heat displays 2016-06-26 15:48:47 -04:00
aidancbrady 82b42282e6 Fixed Chargepad render 2016-06-26 15:41:58 -04:00
freemanovec f450f6ddfe Added czech localization file 2016-06-24 09:29:03 +02: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
Aidan 07e307d9b5 Merge pull request #3393 from onVoid/1.9.4
Update en_US.lang to include Lapis Lazuli
2016-06-23 06:21:01 -10:00
aidancbrady 41d0bf13a2 Fixed item models 2016-06-23 12:20:07 -04:00
onVoid f6f641b267 Update en_US.lang 2016-06-22 13:11:11 -07:00
aidancbrady 286394f7ac Merge branch 'development' into 1.9.4
* development:
  Fixed Bin amount render position
  Bump version to 9.0.3, change Wind Generator weather category, fix Logistical Sorter sound config bypass, fixed Thermal Evaporation Plant internal render

Conflicts:
	build.properties
	src/main/java/mekanism/client/render/tileentity/RenderBin.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java
	src/main/resources/assets/mekanism/sounds.json
2016-06-22 14:29:27 -04:00
aidancbrady b644fbc83f Fixed Bin amount render position 2016-06-22 14:25:20 -04:00
aidancbrady 44ecdd41d0 Bump version to 9.0.3, change Wind Generator weather category, fix Logistical Sorter sound config bypass, fixed Thermal Evaporation Plant internal render 2016-06-22 14:20:22 -04:00
aidancbrady 7b63087ba5 Hopefully fixed build 2016-06-22 13:43:43 -04:00