aidancbrady
603d8d5b02
Bump version
2017-08-01 10:12:49 -07:00
Aidan
dbb86e344d
Merge pull request #4523 from thommy101/issue-4513
...
[1.11] Update BuildCraft API to maven dependency
2017-07-22 20:32:49 -07:00
Tom Elfring
6ba975b84f
Add multiblock structures to cardboard blacklist.
...
Fixes #3613
2017-07-19 11:57:26 +02:00
Tom Elfring
b886d39866
Fix wrong cast BC integration
2017-07-17 15:36:00 +02:00
Tom Elfring
f9c6dc011b
Fix conversion rate BC-RF-Mekanism
2017-07-17 15:30:19 +02:00
Tom Elfring
a32824a434
Update BC to a maven dependency
2017-07-10 18:56:31 +02:00
Tom Elfring
e860089535
Update BuildCraft API to 218FB4A
2017-07-10 18:19:00 +02:00
aidancbrady
a39571d837
Bump version to 9.3.3
2017-06-17 11:31:16 -07:00
aidancbrady
2c1532b293
Version bump
2017-06-10 10:58:33 -07:00
aidancbrady
f2f96ce8f1
Added configurable Fusion Reactor energy generation, don't know why that didn't exist before
2017-06-03 16:07:18 -07:00
aidancbrady
986ce14f2e
Bump version, fixed Purification Chamber sounds, fixed empty Configurator mode
2017-05-27 19:39:24 -07:00
aidancbrady
c9cbb405d4
More API fixes
2017-04-13 16:15:26 -04:00
aidancbrady
c7a74d239b
Better MekanismGenerators config GUI, removed reactor API, better reactor recipe management
2017-04-13 14:42:25 -04:00
aidancbrady
b355b80cf4
Fixed mod IDs, fixed generator recipes, added enabling/disabling of generators via config
2017-04-13 01:42:02 -04:00
aidancbrady
810c089040
Fix some fluid issues
2017-04-05 10:17:36 -04:00
aidancbrady
3d86b75da4
Better gas management
2017-04-04 19:45:51 -04:00
aidancbrady
c89d7d49b9
Bump version, temporary asset purge
2017-03-28 21:04:58 -04:00
aidancbrady
2b02042f4c
Bump version for release
2017-03-24 11:28:26 -04:00
aidancbrady
b6d5a34121
Bump version to 9.2.1
2016-09-12 16:40:16 -04:00
aidancbrady
7dfc9db949
Bump version to 9.2, add Minecraft version-based version handling
2016-08-11 12:15:16 -04:00
aidancbrady
a9177a0989
Bump version to 9.1.1
2016-08-05 21:28:23 -04:00
aidancbrady
90a587383e
Merge branch 'development' into 1.9.4
...
* development:
A few minor fixes, added Ultimate Tier Installer texture
New textures, round 1.
Conflicts:
src/main/java/mekanism/generators/common/MekanismGenerators.java
src/main/java/mekanism/generators/common/block/BlockGenerator.java
2016-07-18 15:56:27 -04:00
aidancbrady
38024f98ad
A few minor fixes, added Ultimate Tier Installer texture
2016-07-18 15:17:47 -04:00
aidancbrady
7b48129909
Merge branch 'development' into 1.9.4
...
* development:
Add necessary networking to Reactor Port
Better tooltips
Actually fix tier installers
Add Silicon crusher recipe, fixed Tier Installers
Rename Factory Installer to Tier Installer, add recipe for Saturating Condenser, add tier upgrade support for Energy Cube, Gas Tank, Fluid Tank and Bin
Bump version to 9.1, add Laser Amplifier comparator support, add Saturating Condensers to recycle water from Industrial Turbines
Conflicts:
build.properties
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/MekanismItems.java
src/main/java/mekanism/common/item/ItemFactoryInstaller.java
src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
src/main/java/mekanism/common/tile/TileEntityBin.java
src/main/java/mekanism/common/tile/TileEntityElectricMachine.java
src/main/java/mekanism/common/tile/TileEntityFactory.java
src/main/java/mekanism/common/tile/TileEntityFluidTank.java
src/main/java/mekanism/common/tile/TileEntityGasTank.java
src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java
src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java
src/main/java/mekanism/generators/common/block/BlockGenerator.java
src/main/java/mekanism/generators/common/block/BlockReactor.java
src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java
src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort-ctm.png
src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort.png
src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPortInput-ctm.png
src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPortInput.png
src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_port-ctm.png
src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_port.png
2016-07-06 18:38:29 -04:00
aidancbrady
28846dcb73
Rename Factory Installer to Tier Installer, add recipe for Saturating Condenser, add tier upgrade support for Energy Cube, Gas Tank, Fluid Tank and Bin
2016-07-06 17:21:24 -04:00
aidancbrady
95c0ad4a73
Bump version to 9.1, add Laser Amplifier comparator support, add Saturating Condensers to recycle water from Industrial Turbines
2016-07-06 16:56:24 -04:00
aidancbrady
53353cd050
Fixed IC2 support (still may crash without), begin adding Tesla support
2016-07-01 11:05:02 -04:00
aidancbrady
202f917345
Begin porting fluid items
2016-06-30 10:41:55 -04: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
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
eb7c2d1b78
Merge branch 'development' into 1.9.4
...
* development:
Fixed Turbines unable to be formed in other dimensions
Bump version to 9.0.2
Fixed Personal Chest crash, bumped default Fuelwood Heater generation, added some null checks to prevent crashes
Fixed outputting energy above Integer.MAX_VALUE to other mods, fixed tiered factories not supporting muffling upgrades, fixed boiler valve height interaction
Conflicts:
src/main/java/mekanism/common/LaserManager.java
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/block/BlockMachine.java
src/main/java/mekanism/common/entity/EntityFlame.java
src/main/java/mekanism/common/tile/TileEntityBoilerValve.java
src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
src/main/java/mekanism/common/tile/TileEntityLaser.java
src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java
src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java
src/main/java/mekanism/common/util/MekanismUtils.java
src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java
2016-05-28 02:34:55 -04:00
aidancbrady
02d2aa1550
Bump version to 9.0.2
2016-05-28 02:02:31 -04:00
aidancbrady
c73eef6be8
<400 errors
2016-05-25 10:10:47 -04:00
aidancbrady
d5656b0264
Merge branch 'development' into 1.8.9
...
* development:
Fixed Turbine Stats crash
Fixed Turbine container crash
Bumped version, fixed Steel Casing recipe, fixed erratic heat behavior, fixed Turbine render crash, added missing localization, fixed Bin crafting crash
ja_JP.lang - translate generators and ores tooltip, fix some entries
ja_JP.lang - translate general machinery and Blocks(without ores) tooltip.
ja_JP.lang - little fix/change
ja_JP.lang - fix/change some entries
ja_JP.lang - translate tooltip and gui text
ja_JP.lang - gui and tooltip translation progress
ja_JP.lang - fix/change some translation(items and blocks)
ja_JP.lang tweak some entries based on v9
Conflicts:
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/util/RecipeUtils.java
2016-05-21 15:31:26 -04:00
aidancbrady
0e0f9584f3
Bumped version, fixed Steel Casing recipe, fixed erratic heat behavior, fixed Turbine render crash, added missing localization, fixed Bin crafting crash
2016-05-21 13:52:28 -04:00
aidancbrady
481535fa11
Remove unnecessary models, fixed some missing texture errors, continued work on MekanismGenerators
2016-05-16 21:15:26 -04:00
aidancbrady
735106c25e
Begin work on MekanismGenerators
2016-05-12 15:07:54 -04:00
aidancbrady
c29e4ab9bc
Work on rendering- need to figure out why flamethrower sound is getting cut off
2016-05-05 21:01:10 -04:00
Ben Spiers
0cb18773aa
Merge branch 'development' into 1.8.9
2016-04-25 16:08:06 +01: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
1071f2fb4d
Adjusted numbers, everything is now nice and balanced
2016-02-29 00:31:19 -05:00
aidancbrady
3c1496740c
Tiered Gas Tanks and tiered Fluid Tanks!
2016-02-24 17:01:43 -05:00
Ben Spiers
b08bca67d4
Merge branch 'v9' into 1.8.9
2016-02-20 22:19:34 +00:00
aidancbrady
4d60d234f3
Added recipes for boiler crafting elements, lessened copper requirements of Solar Evaporation Plant*
...
*still need to rename to Thermal Evaporation Plant
2016-02-18 18:15:39 -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
Ben Spiers
ac39b6fabe
Merge branch 'v9' into 1.8.9
2016-02-08 14:55:27 +00:00
aidancbrady
203890ca88
Redesigned Solar Evaporation Controller to dynamically update heat instead of the simple linear algorithm used before
...
- Plant height determines overall rate of temperature change, rate of processing
- Biomes determine base temperature of plants, meaning a desert could process small amounts of brine on its own
- Rate of heat decay exponentially increases as heat increases, meaning large amounts of heat are needed to greatly increase temperature
- System of heat management designed for integration with heat API in near future
2016-02-02 21:39:37 -05:00
Ben Spiers
6f44d4af24
Merge branch 'v9' into 1.8.9
2016-01-25 20:26:10 +00:00