aidancbrady
a31bc02e83
Merge branch 'master' into development
...
* master:
Update build number
Conflicts:
build.properties
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/generators/common/MekanismGenerators.java
src/main/java/mekanism/tools/common/MekanismTools.java
2016-02-26 14:31:17 -05:00
aidancbrady
baf3ae6f59
Update build number
2016-02-26 14:30:49 -05:00
aidancbrady
d6f6625d83
A bit of work on resistive heaters
2016-02-26 09:28:19 -05:00
aidancbrady
b3143d1abb
Thermodynamic Conductors function properly, added Thermal Evaporation Plant integration with heat system
2016-02-24 20:29:50 -05:00
aidancbrady
2d972edf45
Work on boilers
2016-02-24 17:42:12 -05:00
aidancbrady
3c1496740c
Tiered Gas Tanks and tiered Fluid Tanks!
2016-02-24 17:01:43 -05:00
aidancbrady
08b6490bd3
Merge branch 'development' into v9
...
* development:
Update Danish locale
Add Danish translation
Made text more readable, fix some mistakes
2016-02-23 16:06:51 -05:00
Aidan
e2c2bdacf3
Merge pull request #3107 from LordSheogarad/fixRuLang
...
Update rus locale
2016-02-23 16:05:11 -05:00
aidancbrady
85b3e49800
Merge branch 'master' into development
...
* master:
Update Danish locale
Add Danish translation
2016-02-23 16:05:00 -05:00
Aidan
e4a00cda77
Merge pull request #3109 from LFalch/LFalch-danish-translation
...
Add Danish locale
2016-02-23 16:04:40 -05:00
Lucas Falch
3fe65bdb3a
Update Danish locale
...
Correct mistakes and add missing translations
2016-02-21 23:07:18 +01:00
Lucas Falch
693e7b5e8b
Add Danish translation
...
Still needs some extra polishing and testing
2016-02-21 17:43:26 +01:00
LordSheogarad
18a22800b4
Made text more readable, fix some mistakes
2016-02-21 08:07:09 +05:00
aidancbrady
c9f0ed0941
Fix forestry sapling integration
2016-02-20 11:33:45 -05:00
aidancbrady
d72f4b6181
Don't mine fluid blocks
2016-02-20 11:25:38 -05:00
aidancbrady
0f59e722e1
Use Forge handlers for jetpack/scuba tank display bar instead of item damage
2016-02-20 11:07:54 -05:00
aidancbrady
279cccaa9b
Merge branch 'development' into v9
...
* development:
Fixed chunk boundary acceptor interaction
2016-02-19 18:09:14 -05:00
aidancbrady
7e9aa46fe3
Fixed chunk boundary acceptor interaction
2016-02-19 18:09:03 -05:00
aidancbrady
1ca263813a
Compressed resources now provide 8 uses instead of 10
2016-02-18 18:52:17 -05:00
aidancbrady
84da514b54
Rename Solar Evaporation Plant to Thermal Evaporation Plant
2016-02-18 18:37:38 -05: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
aidancbrady
78c0453225
Merge branch 'development' into v9
...
* development:
Fixed Digital Miner redstone slot interaction
2016-02-15 20:28:28 -05:00
aidancbrady
cde76479ab
Fixed Digital Miner redstone slot interaction
2016-02-15 18:41:23 -05:00
aidancbrady
ff9bbdfde8
More boiler work
2016-02-13 18:59:42 -05:00
aidancbrady
3a2eeac52d
Add multiblock creation algorithm for boiler
2016-02-11 19:35:02 -05: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
aidancbrady
269cd2b406
Refactored Basic Block to use enum-based block types instead of the messy way things were done before
...
Also:
- Worked on preliminary boiler code and assets
- Added tooltips to certain basic blocks
Todo: move pressure disperser from generators to main module
2016-02-09 00:28:52 -05:00
aidancbrady
2bea8ac29a
Work on Thermodynamic Conductors
2016-02-03 11:08:36 -05:00
aidancbrady
f19a8f9e64
Tooltip auto-scaling! All tooltips now have equal widths, even in different languages.
2016-02-03 00:37:39 -05:00
aidancbrady
22bf688fbd
Muffling Upgrades! Mute individual machine volumes.
2016-02-02 22:55:26 -05: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
aidancbrady
56d3a68199
Added energy tab to more machines
2016-02-01 14:57:58 -07:00
aidancbrady
1a35ed161a
Clicking energy info tab will toggle energy unit display type
2016-02-01 14:42:44 -07:00
aidancbrady
7c52d03cb5
Remove some legacy config handling, make all turbine values configurable
2016-01-30 08:46:36 -07:00
aidancbrady
345feedf70
Remove ItemAttacher
2016-01-30 08:19:58 -07:00
aidancbrady
de7bff08d5
Fixed inventory transition
2016-01-29 22:12:51 -07:00
aidancbrady
5aaea55900
Infusing Factories. They're finally here
2016-01-29 21:13:05 -07:00
aidancbrady
88cfee2ab2
Changed Metallurgic Infuser infuse system to use icons for textures
2016-01-29 17:47:41 -07:00
aidancbrady
06dc2227f2
A few ejector fixes
2016-01-28 23:45:22 -07:00
aidancbrady
a22b33a629
Energy Cubes and Gas Tanks now have configurable item inputs and gas/energy outputs, fixed Portable Tank item output
2016-01-29 00:34:50 -05:00
aidancbrady
0a135a6936
Loads of changes to Electric Pump, Fluidic Plenisher and Transmitters
...
- Electric Pumps are now more efficient, upgradable, and have new config options, one of which prevents sucking of water sources (true by default)
- Fluidic Plenishers are now upgradable
- Transmitters can be upgraded by being right-clicked by alloys normally involved in crafting-based upgrading
2016-01-28 20:38:32 -05:00
aidancbrady
b9d064dc06
Cleanup
2016-01-26 08:38:00 -05:00
aidancbrady
b450e7e408
Turbine fixes. They're just about polished
2016-01-26 08:10:36 -05:00
aidancbrady
47b06cd577
More fixes, added recipes for turbine components
2016-01-25 11:58:32 -05:00
aidancbrady
5f23709b0f
One last interface fix
2016-01-25 00:30:14 -05:00
aidancbrady
d210f6c47c
Interface fixes
2016-01-25 00:29:28 -05:00
aidancbrady
2984bf45a8
Loads of untested work on turbine interface
2016-01-25 00:13:42 -05:00
aidancbrady
afe8969c37
Added energy management to turbine and turbine valves
2016-01-23 00:40:30 -05:00
aidancbrady
769a8fd480
Multiblock protocol works, begin turbine tile code
2016-01-22 23:46:16 -05:00
aidancbrady
c341e6290b
Stuff now renders normally
2016-01-22 20:23:20 -05:00
