Commit graph

1774 commits

Author SHA1 Message Date
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
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
aidancbrady
8e1adc97ea Turbine assets completed, added blocks in-game. Still need to add special effect rendering, but that will come later 2016-01-22 20:08:37 -05:00
aidancbrady
9cbc96a88e Textures for turbine components! Still need to texture turbine structure blocks. 2016-01-22 19:36:39 -05:00
aidancbrady
cfa2c1e4d9 Hopefully finalized multiblock form code, started on bringing the new blocks in-game 2016-01-22 17:46:04 -05:00
aidancbrady
8cab2ebe8c Rename Turbine Rod to Turbine Rotor, work on multiblock form code 2016-01-22 17:22:20 -05:00
aidancbrady
0c025e1033 Structural Glass is now real, started on core turbine multiblock code 2016-01-22 15:41:34 -05:00
aidancbrady
bb9c203fae After some very frustrating fixes, added Rotational Complex (with debug max rotation) and got turbines to properly rotate 2016-01-22 00:04:44 -05:00
aidancbrady
6e9ee32df1 Turbines now render and look fancy, fixed some multiblock code 2016-01-21 20:36:40 -05:00
aidancbrady
51c9ca061c Merge branch 'development' into v9
* development:
  Use apache library
2016-01-19 14:41:25 -05:00
aidancbrady
dc7f5cfc9b Merge branch 'master' into development
* master:
  Use apache library
2016-01-19 14:41:13 -05:00
aidancbrady
bfd32a1c3e Use apache library 2016-01-19 14:41:05 -05:00
aidancbrady
bc57033fb9 Merge branch 'development' into v9
* development:
  Fix a small transporter bug
2016-01-18 17:18:24 -05:00
aidancbrady
17425b998f Merge branch 'master' into development
* master:
  Fix a small transporter bug
2016-01-18 17:18:12 -05:00
aidancbrady
1540cd2230 Fix a small transporter bug 2016-01-18 17:18:05 -05:00
aidancbrady
609ed4e3a1 Turbine Rods and Turbine Blades added in-game, multiblock functionality and interaction complete- still need to finish model and rendering stuff 2016-01-17 17:21:06 -05:00
aidancbrady
4c2b470213 Renamed Wind Turbine to Wind Generator, started work on turbine rods/blades for Industrial Turbine 2016-01-17 15:59:02 -05:00
aidancbrady
66cc62a600 Merge branch 'development' into v9
* development:
  Fixed Metallurgic Infuser slots, added new helper UpdateProtocol methods
2016-01-17 13:59:50 -05:00
aidancbrady
c1c15ae707 Fixed Metallurgic Infuser slots, added new helper UpdateProtocol methods 2016-01-16 11:29:37 -05:00
aidancbrady
e747937760 Fixed Solar Generator desert bonus 2016-01-13 23:40:48 -05:00
aidancbrady
7f21516841 Fixed factory tab lighting 2016-01-13 23:15:58 -05:00
aidancbrady
2a78265419 Changed name of boiler to fix conflicts 2016-01-13 18:02:47 -05:00
aidancbrady
3f158d26da Fixed cable crash 2016-01-13 17:00:25 -05:00
aidancbrady
c03c7e0f7a Fixed Reactor Port not accepting items 2016-01-13 16:21:08 -05:00
aidancbrady
0efbd28c8f Updated Box Blacklist parser to be more intuitive 2016-01-13 16:08:14 -05:00
aidancbrady
e950c645e7 Fixed Solar Evaporation Plant memory leaks 2016-01-13 10:53:16 -05:00
aidancbrady
a8efb3b0de Better Solar Evaporation Plant algorithm- much less CPU intensive and fixes all the weird building bugs 2016-01-13 00:10:13 -05:00
aidancbrady
0961b7e042 Reactors now scale steam and water tank capacity to injection rate 2016-01-12 19:07:29 -05:00
aidancbrady
0e1a08474c Removed test recipe registration 2016-01-12 18:48:35 -05:00
aidancbrady
9b3969f1ff Shapeless Mekanism Recipes, IMC crafting recipe integration, fixed removal of machine recipes 2016-01-12 18:41:15 -05:00
aidancbrady
ab5fe0c819 Fixed IMC recipe deletion 2016-01-11 21:13:36 -05:00
aidancbrady
0b984148b4 Fixed blocks not being harvested by items with one damage level 2016-01-11 21:00:32 -05:00
aidancbrady
a72e043947 WAILA bounding block support 2016-01-11 20:55:16 -05:00
aidancbrady
72193075ab More efficient transporter tree searching 2016-01-11 20:45:13 -05:00
aidancbrady
b6306d0779 More sound fixes 2016-01-09 13:37:37 -05:00
aidancbrady
4d65942f11 Server hotfix 2016-01-09 10:07:22 -05:00
aidancbrady
99fc98faf5 Fixed HolidayManager 2016-01-08 12:24:27 -05:00
aidancbrady
faf63dfebc Updated readme, improved Electric Pump calculation 2016-01-08 00:40:37 -05:00
aidancbrady
7016268cbc Better redstone support, fixed fuse sound 2016-01-05 20:35:42 -05:00
aidancbrady
8728531f77 Add short parsing to PacketHandler 2016-01-05 15:35:36 -05:00
aidancbrady
f9681a9942 Quick lib fix 2016-01-04 18:13:46 -05:00
aidancbrady
08eb8be841 A few necessary library additions 2016-01-04 00:33:00 -05:00
aidancbrady
11574e9454 Fixed Reactor Logic Adapter double parse, thanks @habnabit 2015-12-31 15:06:11 -05:00
aidancbrady
3ff2ede090 Updated Electrolytic Separator internals to support redstone control 2015-12-31 14:55:49 -05:00
aidancbrady
bd3bc4402f Fix Metallurgic Infuser upgrade slot conflict 2015-12-31 14:25:26 -05:00
aidancbrady
a71b6bda01 Adjustable Flamethrower modes - combat, heat, and inferno 2015-11-28 08:58:26 -07:00
aidancbrady
f88a97697f Fixed Gas Tank comparator support 2015-11-27 23:29:55 -07:00
aidancbrady
21fa9fdb26 Cleaned up computer integration 2015-11-27 23:19:29 -07:00
aidancbrady
c2006d5e70 Computer integration fixes 2015-11-27 23:04:43 -07:00
aidancbrady
a4ab830e79 Cleanup, added Redstone Logic Adapter OC support 2015-11-27 22:04:39 -07:00
aidancbrady
fbd692b4e0 Fixed transporter tier calculations 2015-11-27 12:30:49 -07:00
aidancbrady
f5c48f60e6 Teleport now specifies orientation, closes #2977 2015-11-27 10:41:45 -07:00
aidancbrady
6466463a63 Bumped version 2015-11-26 15:44:42 -07:00
aidancbrady
2b785c95f3 Transmitters now intelligently maintain buffers when transmitter nodes are destroyed 2015-11-26 15:41:22 -07:00
aidancbrady
b248cf4b07 Fixed fluid/gas duplication 2015-11-26 14:40:46 -07:00
aidancbrady
f6154e2cb3 Fixed sorter not behaving nicely with double chests 2015-11-26 13:39:46 -07:00
aidancbrady
de839808d7 Improved chemical machines side config 2015-11-26 10:39:36 -07:00
aidancbrady
a14b0d77ad Fixed Induction Matrix computer integration 2015-11-25 10:34:49 -07:00
aidancbrady
2640cbd50b Fixed injection rate integration 2015-11-25 10:26:50 -07:00
aidancbrady
0313e59b8f BuildCraft API cleanup and update 2015-11-25 10:24:45 -07:00
aidancbrady
79483d1fa7 Merge branch 'master' into development 2015-11-25 10:10:04 -07:00
aidancbrady
650224bdd8 Fixed Solar Evaporation Controller crash 2015-11-25 10:09:48 -07:00
aidancbrady
40f7373819 Fixed a small crash 2015-11-25 08:48:05 -07:00
aidancbrady
ef6d62294d Cleanup 2015-11-25 08:43:08 -07:00
aidancbrady
57eaa5d154 Fixed a small bin issue 2015-11-20 10:41:36 -05:00
Tim Stableford
ef62f57836 Fix for CC peripherals always throwing error. 2015-11-06 18:31:27 +00:00
Aidan
8ecf0a74a8 Merge pull request #2950 from shadowfacts/sync-xp
Force the player's experience to sync when changing dimensions
2015-11-03 21:24:10 -05:00
Shadowfacts
4e87e281c9 Force the player's experience to sync when changing dimensions
(Thank you, @Gebatzens)

Fixes #2943

Also add misc IDEA files to .gitignore
2015-09-06 13:23:19 -04:00
Vexatos
d0046e97ab Update de_DE.lang 2015-08-31 16:45:14 +02:00
Ben Spiers
4040a57a16 Oops 2015-07-28 18:53:29 +01:00
Ben Spiers
9a3f0ae633 Version Number Update: 8.1.7 2015-07-28 18:46:00 +01:00
Ben Spiers
51f1c68f05 Fix Sided Inventories with the logistical sorter 2015-07-28 18:26:17 +01:00
Ben Spiers
c9f51bd970 Update some MekanismUtils functions to use Coord4D 2015-07-28 04:58:04 +01:00
Yip Rui Fung
9cb67fa054 Fix StackSearcher using variable side before initializing it. Fixes #2844 2015-07-26 15:24:59 +08:00
Yip Rui Fung
4bf799e37d Fix AE2 P2P registration. 2015-07-25 10:20:06 +08:00
Yip Rui Fung
766f0d5302 Fix bin crash when interacting with empty hand. 2015-07-25 08:59:25 +08:00
ruifung
d9cc8fe157 Register transmitter items with AE2 P2P
So the respective transmitters can be used to attune a AE2 P2P bus.

Please tell me if I'm missing anything on the mekanism side.
2015-07-23 18:23:56 +08:00
aidancbrady
4001b06b49 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-07-22 15:43:53 -07:00
aidancbrady
4e46fa4c5f no message 2015-07-22 15:43:47 -07:00
Ben Spiers
53d8522d42 Make a change to prevent networks leaking on chunk unload.
It seems to have fixed the broken pipe issue as well, please test.
2015-07-21 20:45:06 +01:00
Ben Spiers
22282fc838 Update BC API 2015-07-21 20:45:05 +01:00
aidancbrady
7323a13e09 Support for custom localizations, closes #2626 2015-07-20 18:48:45 -07:00
aidancbrady
9a9f77af87 Fixed a few balloon issues 2015-07-20 14:26:55 -07:00
aidancbrady
c7fe1f86eb Cleaner CC support with a separate peripheral handler 2015-07-20 12:28:18 -07:00
aidancbrady
728e497dd1 Forgot about generators! 2015-07-20 11:58:03 -07:00
aidancbrady
ee709cc202 New computer integration for the rest of Mekanism machinery 2015-07-20 11:43:49 -07:00
aidancbrady
a94c13edc7 Implement new computer framework in primary machines 2015-07-20 11:09:44 -07:00
aidancbrady
a062ea5e9e Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-07-20 10:53:18 -07:00
aidancbrady
d39536d89c Cool new factory textures (thanks @Radviger), also a (temporarily unused) OC layer. Does this look good @Vexatos? 2015-07-20 10:53:12 -07:00
Ben Spiers
41492f5d28 Add a FakePlayer op commands. 2015-07-19 23:31:56 +01:00
Ben Spiers
74939083c8 Fix frame mods moving Teleporters with fake worlds
If there is no ChunkProvider, the block can't be unloaded.
2015-07-19 13:40:03 +01:00
aidancbrady
2c88357477 Merge branches 'development' and 'development' of https://github.com/aidancbrady/Mekanism into development 2015-07-18 23:57:58 -07:00
aidancbrady
6ab72698dc Finally made my IDEA workspace happy, assets weren't being recognized for some reason 2015-07-18 23:57:50 -07:00
Ben Spiers
d5f5565694 Make the logistical sorter skip unplaceable stacks
Java could really do with generators/yield semantics.
2015-07-19 01:16:46 +01:00
Ben Spiers
d994f18117 Fix Railcraft engine compatibility.
For some reason they're not IEnergyProviders.
2015-07-18 21:53:19 +01:00
Ben Spiers
3d34b8c83f Make it actually possible to watch transmitter log
Don't know how/when that broke.
2015-07-18 21:50:42 +01:00
aidancbrady
a2fb334833 IMC-based recipe removal. Wiki is updated as well :) 2015-07-14 15:59:55 -07:00
aidancbrady
a1eb8306ee Defined redstone connections for Redstone Logic Adapters, closes #2808 2015-07-14 15:43:23 -07:00
aidancbrady
6bda8addcb Accept power from ForgeDirection.UNKNOWN 2015-07-14 14:30:51 -07:00
aidancbrady
7799afed53 Go ahead and bump Forge to latest recommended, 1291 is looking too old 2015-07-14 14:22:27 -07:00
Aidan
b743618186 Merge pull request #2805 from halvors/fix/get-pick-block
Update getPickBlock() to use the new non-deprecated version.
2015-07-08 09:28:44 -07:00
aidancbrady
2021ff0f7a Merge branch 'master' into development 2015-07-08 09:27:50 -07:00
Halvor Lyche Strandvoll
037e1e553f Update getPickBlock() to use the new non-deprecated version. 2015-07-08 12:34:02 +02:00
Mazdallier
ea3bc94c29 Update fr_FR.lang
heavy water bucket and reactor logic modes
2015-07-08 12:02:02 +02:00