aidancbrady
384bf643e0
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2015-05-22 13:06:51 -04:00
aidancbrady
fa71836e0d
Fixed bad cast, fixed tubes and pipes losing capacity after world load
2015-05-22 13:06:46 -04:00
tterrag1098
b70c0e015f
Remove hard dep on unnecessarily new forge version
2015-05-13 17:18:21 -04:00
aidancbrady
0b04665055
Another fluid tank fix
2015-05-11 10:42:58 -04:00
aidancbrady
1377ec88e8
Fixed circuit OreDict implementation
2015-05-10 19:45:09 -04:00
aidancbrady
6a25667b20
Added property to prevent world damage by flamethrowers & lasers
2015-05-10 19:33:28 -04:00
aidancbrady
909e80ff77
Fixed a transporter crash, don't scale Electrolytic Separator energy usage
2015-05-10 19:20:36 -04:00
aidancbrady
9ffc1bdff3
Localization fixes, part 1
2015-05-10 19:04:42 -04:00
aidancbrady
1c8c12ee88
Fixed a small Dynamic Tank bug
2015-05-09 18:12:41 -04:00
aidancbrady
c62e27d5fd
Configurable armored jetpack resistance values, quadrupled brine production rate of SE plants
2015-05-06 08:34:04 -04:00
aidancbrady
3185f1bf22
Bumped version to 8.1.3
2015-05-05 10:45:59 -04:00
aidancbrady
a32d6f4953
A few fixes
2015-04-28 08:24:54 -07:00
aidancbrady
33ff01b436
Fixed transporters
2015-04-27 11:09:20 -07:00
aidancbrady
281836fc4a
Revert "Oops, forgot to update the miner inventory slots"
...
This reverts commit 93a1789053
2015-04-26 19:41:10 -07:00
aidancbrady
c839ce5697
Revert "Changes to GUI's for more flexibility & consistancy"
...
This reverts commit 61406c2b2d
2015-04-26 19:41:03 -07:00
aidancbrady
2cbcaf0a3b
Added Podzol recipe
2015-04-26 19:39:02 -07:00
aidancbrady
abce650fd4
Maybe fix bad transporters
2015-04-26 12:44:46 -07:00
aidancbrady
b44f7a999b
Fixed Digital Miner starting on world load
2015-04-26 12:24:49 -07:00
Aidan Brady
8030b0e057
Fixed icons, bumped Mekanism version to 8.1.2, bumped Forge to 1395, updated CB libraries
2015-04-25 13:14:10 -07:00
TehStoneMan
f8d6993f0f
Merge remote-tracking branch 'upstream/development' into development
2015-04-24 11:02:08 +10:00
TehStoneMan
93a1789053
Oops, forgot to update the miner inventory slots
2015-04-24 10:58:38 +10:00
TehStoneMan
61406c2b2d
Changes to GUI's for more flexibility & consistancy
...
First stage of changing GUI's to add flexibility to elements, and
consistancy of visual design. Not all devices have been updated yet.
2015-04-24 00:14:03 +10:00
RAWRwins254
746ed3f5d7
Fixing NPE from EnergyAcceptorWrapper.java not handling ticks that aren't related to a TileEntity.
2015-04-23 01:46:04 -05:00
Ben Spiers
5baf4605e0
Fix FluidStack now being amount-specific in its hashCode() method.
2015-04-17 18:29:57 +01:00
Ben Spiers
e6ee804686
Update forge again.
2015-04-17 18:27:41 +01:00
Ben Spiers
0919a82484
Merge branch 'master' into development
2015-04-17 18:01:03 +01:00
Ben Spiers
d8c26c3ed0
Hopefully fix some RF problems with pseudo-acceptors.
2015-04-17 17:44:02 +01:00
emperor06
447e81c1be
Added ComputerCraft support to Induction Matrix.
2015-04-16 17:35:48 +02:00
Aidan C. Brady
308233720c
Temporary fix for multiple buffer type merges
2015-04-15 12:52:07 -04:00
Aidan C. Brady
2c53ce6956
Configurator's "empty" mode now only works on Mekanism container blocks
2015-04-15 12:44:52 -04:00
Aidan C. Brady
425f0c27c3
Prevent crash when creating EnergyAcceptorWrapper
2015-04-14 10:55:38 -04:00
Aidan C. Brady
33f19cf895
Fixed a crash
2015-04-13 08:43:08 -04:00
Aidan C. Brady
9d76df996c
Tiny cleanup
2015-04-13 08:19:36 -04:00
Aidan C. Brady
da661af41c
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
2015-04-12 17:16:21 -04:00
Aidan C. Brady
f89f3c1aaa
Fixed hash code assignment
2015-04-12 17:16:16 -04:00
Ben Spiers
03e45cc401
Back to Forge 1291.
...
Turns out I do silly things when I'm tired...
2015-04-12 03:38:33 +01:00
Ben Spiers
866abf5c8d
Fix build.
2015-04-12 00:38:28 +01:00
Ben Spiers
13221b5bf3
Remove some unused methods.
2015-04-12 00:12:18 +01:00
Ben Spiers
d73eed2865
Fix the draining issue
2015-04-12 00:09:35 +01:00
Ben Spiers
17e1cea25a
Possible fix for EnergyNet weirdness.
2015-04-11 14:27:21 +01:00
Ben Spiers
420e1619e6
Clean up some TransporterPathfinder stuff.
2015-04-10 23:55:59 +01:00
Ben Spiers
7b4404a973
Remove an unused parameter.
2015-04-10 23:55:59 +01:00
Ben Spiers
91d323ccdd
Maybe fix negative buffer issues .
2015-04-10 23:55:59 +01:00
Ben Spiers
05508b598a
Fix non-overworld dimensions.
2015-04-10 19:21:34 +01:00
Ben Spiers
cb95cfeedd
Fix ITubeConnection acceptors that aren't IGasHandler
2015-04-10 18:39:06 +01:00
Aidan C. Brady
5fec517a6d
Crash fix
2015-04-10 08:34:02 -04:00
Aidan C. Brady
174509444b
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2015-04-10 08:24:34 -04:00
Aidan C. Brady
a03ef85f4c
Fixed compile, bumped version to 8.1.1
2015-04-10 08:24:28 -04:00
Ben Spiers
94189a4f61
Fix Transporters with multipart.
2015-04-09 02:39:23 +01:00
Ben Spiers
4ca9456de8
Use path score to sort paths, not length.
2015-04-09 02:39:23 +01:00
Ben Spiers
36f0607d5e
Prioritise faster paths, by making cost inversely proportional to speed.
2015-04-09 02:39:23 +01:00
Aidan C. Brady
068e4b58a7
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2015-04-07 10:42:50 -04:00
Aidan C. Brady
12ebfe6745
ThreadSparkle is now operated in main client thread time - new safety checks will prevent serious lag anyway
2015-04-07 10:41:17 -04:00
Ben Spiers
4a2dde8f87
Fix API, put back some methods that GC uses, optimise imports in API.
2015-04-06 18:53:16 +01:00
Aidan C. Brady
034d732e15
A bit more tidying
2015-04-06 11:10:57 -04:00
Aidan C. Brady
ec7b0555c9
Cleanup
2015-04-06 11:08:57 -04:00
Aidan
841e358ce0
Merge pull request #2478 from aidancbrady/networkRefactor
...
Network Refactor
2015-04-06 11:00:45 -04:00
Ben Spiers
f4a6fb8274
Do some things I TODOed earlier
2015-04-06 04:32:47 +01:00
Ben Spiers
d70595ad84
Fix a last few issues, and stop leaking networks on the client
2015-04-06 04:11:08 +01:00
TehStoneMan
f74acdfca6
Updated Digital Miner GUI
...
Updates to the Digital Miner config GUI to match changes to Logistical
Sorter GUI
2015-04-06 11:38:21 +10:00
Ben Spiers
c13b3b240f
Fix some bugs with LogiTransporters
2015-04-06 02:18:45 +01:00
Ben Spiers
16ce88f09a
Restore some client-side network stuff. More fixes
2015-04-06 01:29:07 +01:00
TehStoneMan
293b8c08f1
Sorting buttons now work
...
Got the sorting buttons to work. Clicking on the arrow buttons on a
filter panel will now move that filter up or down in the filter list.
Without having made any changed to how filters are processed, filters
higher in the list will naturally be processed before later filters,
thereby making it like a priority system.
For example, if an item matches two filters, the higher priority filter
will take that item before the lower filter, in that way seperating a
specific item from a broader (wildcard) specified filter.
2015-04-05 23:03:56 +10:00
Ben Spiers
ede0015eec
Merge branch 'development' into networkRefactor
...
Conflicts:
src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
2015-04-04 02:58:26 +01:00
Ben Spiers
d29d1580bb
Fix some stuff I missed in the merge, and server-client communication.
2015-04-04 02:44:14 +01:00
Aidan C. Brady
41cfed37b7
Fixed a few crashes
2015-04-03 20:21:05 -04:00
Ben Spiers
7a2461540f
Merge branch 'development' into networkRefactor.
...
Hopefully I didn't miss anything
Conflicts:
src/main/java/mekanism/api/gas/GasNetwork.java
src/main/java/mekanism/client/render/RenderPartTransmitter.java
src/main/java/mekanism/common/EnergyNetwork.java
src/main/java/mekanism/common/FluidNetwork.java
src/main/java/mekanism/common/InventoryNetwork.java
src/main/java/mekanism/common/content/transporter/TransporterStack.java
src/main/java/mekanism/common/multipart/PartHeatTransmitter.java
src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
src/main/java/mekanism/common/multipart/PartMechanicalPipe.java
src/main/java/mekanism/common/multipart/PartPressurizedTube.java
src/main/java/mekanism/common/multipart/PartSidedPipe.java
src/main/java/mekanism/common/multipart/PartUniversalCable.java
src/main/java/mekanism/common/util/MekanismUtils.java
src/main/java/mekanism/common/util/PipeUtils.java
2015-04-03 19:45:25 +01:00
Ben Spiers
29659ad2cd
Fix some client/server stuff, and fluid networks
2015-04-03 18:04:56 +01:00
Aidan C. Brady
8d38f63f5f
Bumped version to 8.1.0
2015-04-01 23:09:27 -04:00
Ben Spiers
d14686ea2e
Work on clientsiding, acceptors and things like redstone and multipart blocking.
2015-04-02 03:22:53 +01:00
Aidan C. Brady
45895cb753
Configurable values for Mekanism tier-related properties
2015-04-01 11:06:27 -04:00
Aidan C. Brady
dc0a90921a
A few crash fixes
2015-04-01 09:06:23 -04:00
Ben Spiers
47b4eb28b4
Start on refactor of entire network system.
...
It will hopefully make networks more robust and efficient, using lessons learned since last time I rewrote large parts of it.
We can hopefully avoid Concurrent Modification issues this way, and it should be more forgiving on chunk loads as well.
Transmitter stuff is working well, next acceptors and client rendering need tobe brought in.
2015-04-01 02:42:36 +01:00
Aidan C. Brady
fe8cc9d1e0
Tiered Pressurized Tubes, better tooltips, better transmitter icons
2015-03-31 17:46:09 -04:00
Aidan C. Brady
1438d601e3
Better Mechanical Pipe textures
2015-03-31 13:44:57 -04:00
Aidan C. Brady
a5db67e2b7
Tiered Logistical Transporters
2015-03-31 11:39:10 -04:00
Aidan C. Brady
413fac32fa
Logistical Transporters now render color in glass instead of frame
2015-03-31 08:47:40 -04:00
Aidan C. Brady
c85bdcd8ab
Entity Detection mode for Laser Amplifier
2015-03-30 20:18:08 -04:00
Aidan C. Brady
e4d624d8ab
Fancy new eject algorithms, should fix issues with PRC
2015-03-30 19:27:54 -04:00
Aidan C. Brady
b4c2664c5e
Work a bit on a new, dynamic ejector system
2015-03-30 08:39:37 -04:00
Aidan C. Brady
af48daf73b
When multiblenetworks of differing fluids/gasses merge, replace one, don't add up the total gas
2015-03-30 00:21:42 -04:00
Aidan C. Brady
0193e0b010
Hopefully drastically reduced necessary CPU time for transmitters when checking connections
2015-03-30 00:11:54 -04:00
Aidan C. Brady
4f29e497b4
Fixed amplifiers
2015-03-29 18:34:48 -04:00
Aidan C. Brady
f350055fab
Universal Cables can now draw energy from laser amplifiers
2015-03-29 18:29:34 -04:00
Aidan C. Brady
2af3ef79f0
Merge branch 'development' into v8.1
2015-03-29 13:28:57 -04:00
Aidan C. Brady
b055b116e5
Don't reset induction cell storage
2015-03-29 13:26:43 -04:00
Aidan C. Brady
9b1aa2099b
Started work on Reactor Logic Adapters
2015-03-29 12:50:15 -04:00
Aidan C. Brady
1c7f7a09ac
Energy Cubes now use old localization standards
2015-03-29 11:01:54 -04:00
Aidan C. Brady
61735a27aa
Fixed Solar Neutron Activator not rendering in inventory, fixed Solar Neutron Activator replacing blocks
2015-03-29 10:49:28 -04:00
Aidan C. Brady
6ec5a0a2fe
Fixed Metallurgic Infuser output slot
2015-03-29 01:38:03 -04:00
Aidan C. Brady
9489270315
Fixed a few localization issues, fixed Electrolytic Separator dump excess mode on left tank
2015-03-29 00:54:43 -04:00
Aidan C. Brady
0c9fd9364e
Fixed usage displays of certain machinery
2015-03-29 00:42:40 -04:00
Aidan C. Brady
ac41365c86
Fixed "dump excess mode" making gas levels jump up and down, fixed a few particles issues
2015-03-28 21:44:18 -04:00
Aidan C. Brady
f10a352230
Fixed Diversion Transporter not updating surroundings when changing diverter mode
2015-03-28 21:12:34 -04:00
Aidan C. Brady
0b1b78d5a6
Fixed Restrictive Transporter render in both item and block form
2015-03-28 21:09:07 -04:00
Aidan C. Brady
5da4a522cb
A few Portable Teleporter fixes
2015-03-28 20:34:57 -04:00
Aidan C. Brady
1fbf9f1568
Merged
2015-03-28 17:34:47 -04:00
Aidan C. Brady
542b995b3b
Electric Pump and Fluidic Plenisher now have CC support for resetting their calculations
2015-03-28 17:27:43 -04:00
Aidan C. Brady
f2d9049a2e
Flamethrower now only sets blocks to fire on server
2015-03-28 17:10:55 -04:00
Aidan C. Brady
07d0c2bfc1
Hopefully fixed negative buffer issue
2015-03-27 17:09:23 -04:00
Aidan C. Brady
543d45d57a
Fixed a few models, fixed a crash
2015-03-27 13:09:41 -04:00
Aidan C. Brady
a0af78ef46
Teleporters now follow CTM
2015-03-26 23:53:22 -04:00
Aidan C. Brady
3ba0dd5172
Bins now use the dynamic texture render system
2015-03-26 20:03:46 -04:00
Aidan C. Brady
babc934079
Hopefully fix an issue
2015-03-26 18:13:33 -04:00
Aidan C. Brady
2546d9c28e
Bump version to 8.0.3
2015-03-26 18:08:56 -04:00
Aidan C. Brady
266becb27a
Fixed factory top active dynamic texture
2015-03-26 17:30:16 -04:00
Aidan C. Brady
bf5e6b788f
A few fixes for the last commit
2015-03-26 17:23:41 -04:00
Aidan C. Brady
7afef3f8ee
Fixed an API issue, implemented new default icon system to allow for dynamic factory icons based on recipe type
2015-03-26 17:10:32 -04:00
Aidan C. Brady
2d727b56ca
Fixed some naming - factories now display their complete names
2015-03-26 10:17:06 -04:00
Aidan C. Brady
8344ed25f7
Fixed redstone neighbor checks. Now works exactly as the Minecraft check does, simply without loading chunks.
2015-03-26 09:30:55 -04:00
Aidan C. Brady
d88f8a4606
Fixed upgrades not maintaining machine dataa
2015-03-25 23:51:46 -04:00
Aidan C. Brady
1f9e6dd9cb
Bumped up Chemical Infuser gas output
2015-03-25 22:01:45 -04:00
Aidan C. Brady
f0c13c8f66
Added Oredictionificator & Factory dynamic texture support
2015-03-25 22:00:18 -04:00
Aidan C. Brady
f83d481fd6
Rewrote multiblock data saving, changed simple side names
2015-03-25 21:49:07 -04:00
Aidan C. Brady
99d6684425
Mark inventory as dirty after transmitting items
2015-03-25 18:13:13 -04:00
Aidan C. Brady
19e0530253
New fancy machine icon renderer - rotates top and bottom icon based on facing, also adds support for resource pack-based side textures
2015-03-25 01:19:37 -04:00
Aidan C. Brady
69624715ec
Fixed a crash
2015-03-24 23:19:56 -04:00
Aidan C. Brady
f9070f33d0
Fixed Induction Matrix not outputting properly
2015-03-24 21:43:22 -04:00
Aidan C. Brady
0e51852baa
Cleanup, fixed a transporter bug
2015-03-24 18:33:13 -04:00
Aidan C. Brady
6c70dc100b
Fixed configuration tabs not rendering properly
2015-03-24 18:09:31 -04:00
Aidan C. Brady
3cb4562461
Added nuggets to Oredictionificator ore list, fixed a small bug
2015-03-24 17:56:25 -04:00
Aidan C. Brady
47e68e648e
Fixed Oredictionificator not working with inventory pipes
2015-03-24 13:21:36 -04:00
Aidan C. Brady
3be6126aea
Javadocs!
2015-03-24 11:02:22 -04:00
Aidan C. Brady
ab3064b591
Properly convert to configured display units Wind Turbine
2015-03-24 11:01:17 -04:00
Aidan C. Brady
299d93e67d
Fixed Laser Amplifier unit conversion
2015-03-24 08:56:02 -04:00
Aidan C. Brady
ca9ec78399
Make Laser Amplifier require an Advanced Induction Cell, fixed RF & EU display units
2015-03-24 08:46:41 -04:00
Aidan C. Brady
6892156454
Fixed Solar Evaporation Controllers not properly accepting buckets
2015-03-24 08:05:59 -04:00
Aidan C. Brady
96ccdb8f58
Fixed multiblock creation
2015-03-24 07:58:45 -04:00
Aidan C. Brady
5513859216
Cleanup, updated IC2 API
2015-03-23 20:34:43 -04:00
Halvor Lyche Strandvoll
7409a83088
Fixed OreDictionary filter in Miner not writing "requireStack" to NBT.
2015-03-24 00:32:04 +01:00
Aidan C. Brady
c52d41383f
Fixed a few crashes
2015-03-22 22:52:37 -04:00
Aidan C. Brady
d2c6effabb
Bump version to 8.0.2
2015-03-22 21:57:28 -04:00
Aidan C. Brady
62be3523d7
Fixed Gas Masks not working
2015-03-22 21:53:00 -04:00
Ben Spiers
4590a71759
Make the checking of instances of other mods' interfaces safer.
...
Fixes (part of) #2316
2015-03-23 01:11:45 +00:00
Aidan C. Brady
e18cf2dd4a
Fixed Digital Miner not auto-ejecting
2015-03-22 18:31:56 -04:00
Aidan C. Brady
36ffdeb0e5
Cleanup
2015-03-22 17:44:07 -04:00
Ben Spiers
1fe0484cd1
Fix notifyTileChanges() loading chunks.
2015-03-22 21:32:31 +00:00
Aidan C. Brady
c7d3b77112
Fixed another transition issue
2015-03-22 16:16:01 -04:00
Aidan C. Brady
2b2d9d69b3
Fixed transition crashes
2015-03-22 16:13:06 -04:00
Ben Spiers
09617fdb4c
Gas Upgrade Recipe
2015-03-22 14:41:47 +00:00
Ben Spiers
0064f09d8c
Backwards-compatibility for IGasHandler. #2267
2015-03-22 14:36:21 +00:00
Ben Spiers
050f3351e2
Fix advanced-recipe factories not using gas at first
2015-03-22 13:07:25 +00:00
Aidan C. Brady
d061792f3e
Actually fix println
2015-03-22 01:33:25 -05:00
Aidan C. Brady
2ebb4838e8
Waila integration - fixes issues with Induction Cells & Induction Providers, also fixed println
2015-03-22 01:33:17 -05:00
Aidan C. Brady
d6c48a6e71
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2015-03-22 00:48:44 -05:00
Aidan C. Brady
9a2d47ad4b
Default icons for all Mekanism blocks - fixes particle issues
2015-03-22 00:47:59 -05:00
Aidan C. Brady
dd96064a3f
Fixed Electric Pump text overlap, fixed OreDict filter not reading from nbt/packet properly
2015-03-22 00:40:05 -05:00
Ben Spiers
c0281d4470
Fix #2298
2015-03-22 02:23:45 +00:00
Aidan C. Brady
f8f1467304
Cleanup
2015-03-21 17:23:36 -05:00
Aidan C. Brady
e089413f30
Laser Amplifier now properly saves and loads its inventory from NBT
2015-03-21 17:18:14 -05:00
Ben Spiers
c323969c87
Recalcuation things.
2015-03-21 19:44:17 +00:00
Ben Spiers
83e41478e5
Localisation, icon, fixes.
2015-03-21 19:13:15 +00:00
Ben Spiers
2e8edb281c
Gas Upgrades.
2015-03-21 19:13:04 +00:00
Ben Spiers
0658e04880
Fix upgrade dupe with factories.
2015-03-21 19:12:55 +00:00
Ben Spiers
9936c05da7
Recipe and upgrade fixes.
2015-03-21 19:11:56 +00:00
Aidan C. Brady
72026dd1c5
Lasers now dynamically damage entities based on energy output
2015-03-21 11:31:51 -05:00
Aidan C. Brady
765b58a058
Fixed a transition crash
2015-03-21 11:11:24 -05:00
Aidan C. Brady
a31449c2d3
Fixed the crafting issue - it was fairly silly, actually
2015-03-21 00:50:19 -05:00
Aidan C. Brady
3305581373
Fixed Precision Sawmill not applying secondary outputs
2015-03-20 23:16:48 -05:00
Aidan C. Brady
84759daacd
Fixed Metallurgic Infuser not switching to inactive state
2015-03-20 23:04:33 -05:00
Aidan C. Brady
81b5724c53
Self-merged Chemical Infuser fix
2015-03-20 22:54:48 -05:00
Aidan C. Brady
39621a74b1
Added config to display profiled portable tanks
2015-03-20 22:46:26 -05:00
David Vierra
30684d6aef
Fix Metallurgic Infuser not auto-ejecting output
...
Fixes #2268
(it was trying to auto-eject energy cells :P)
I checked all of the other TileComponentEjector instances for similar errors, the rest of them look okay.
2015-03-20 14:16:23 -10:00
Aidan C. Brady
37bc6a07c0
Flamethrowers now use gas
2015-03-20 17:34:11 -05:00
Aidan C. Brady
8173af50e0
Bump version to 8.0.1 - preparing to fix some bugs
2015-03-20 15:28:20 -04:00
Aidan C. Brady
e92f2654de
API finalization, all set for release.
2015-03-20 14:18:18 -04:00
Aidan C. Brady
5206c6106e
Use HTTPS for donator list download
2015-03-20 14:03:02 -04:00
Aidan C. Brady
2664e2e04c
Perfected flamethrowers in SMP
2015-03-20 13:13:24 -04:00
Aidan C. Brady
5a35d54a5c
Flamethrower networking fixes
2015-03-20 13:06:19 -04:00
Aidan C. Brady
6d85b0800f
Fixed a Metallurgic Infuser container bug, hopefully fixed flamethrowers on SMP
2015-03-20 01:39:22 -04:00
Aidan C. Brady
8d83ada60f
Fixed a Laser Amplifier & Laser Tractor Beam inventory crash, fixed missing sounds for Chargepad, Chemical Crystallzer, Chemical Washer & Metallurgic Infuser
2015-03-20 01:30:11 -04:00
Aidan C. Brady
c3ef938166
Implemented the SoundWrapper system again - for some reason dedicated servers won't behave without it on OS X
2015-03-19 23:16:27 -04:00
Aidan C. Brady
6bae353118
Fixed a transition crash
2015-03-19 20:41:18 -04:00
Aidan C. Brady
6276439c51
Fixed Charcoal Blocks and Refined Flowstone screwing up
2015-03-19 20:16:21 -04:00
Aidan C. Brady
eb7865b967
Eject config now should transition between versions.
2015-03-19 20:05:37 -04:00
Aidan C. Brady
b096202137
Hopefully finish off the migration of side configuration
2015-03-19 19:31:17 -04:00
Aidan C. Brady
6bea59ab5e
Upgrades should now transition between v7 and v8
2015-03-19 18:57:09 -04:00
Aidan C. Brady
061c84d586
Even better factory transition
2015-03-19 18:53:02 -04:00
Aidan C. Brady
d3df5c5ce7
Attempt a fix at factory world transition
2015-03-19 18:12:06 -04:00
Aidan C. Brady
a1929b1918
Added recipe to turn brine into salt
2015-03-19 17:44:27 -04:00
Aidan C. Brady
a6e8fc8de0
Energy usage calculations are now much more efficient
2015-03-19 17:36:43 -04:00
Aidan C. Brady
763aef4fd0
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2015-03-19 17:22:45 -04:00
Aidan C. Brady
3b96fe4a4c
Fixed Digital Miner, fixed energy upgrades not affecting usage of Chemical Washers/Electrolytic Separators/Chemical Infusers/Rotary Condensentrators, added "dump excess" to electrolytic separator
2015-03-19 17:22:31 -04:00
Ben Spiers
b69e6a9d80
Make temperatures consistent.
2015-03-19 16:41:07 +00:00
Aidan C. Brady
b51fbe79fd
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2015-03-19 08:54:06 -04:00
Aidan C. Brady
7bfaa738e3
Fixed teleporter crash
2015-03-19 08:53:43 -04:00
Ben Spiers
d560ea91a8
Move lighting config to general.
...
Hopefully fixes whatever weird issue was going on before.
2015-03-19 12:47:36 +00:00
Aidan C. Brady
7dec274a56
Fixed server-sided light value calls
2015-03-19 07:06:21 -04:00
Ben Spiers
b817b2840c
Fix Generator Tiles' client/server sidedness
2015-03-19 00:36:29 +00:00
Ben Spiers
a90680eaae
Fix sounds on the client-side of factories
2015-03-19 00:16:36 +00:00
Ben Spiers
efeeb06b77
Move rendering IDs to Common Proxy classes to appease ExtraUtils.
2015-03-18 21:39:01 +00:00
Ben Spiers
e36ecf9f05
Clean up and fix some stuff from the rebase pull.
2015-03-18 21:00:11 +00:00
Ben Spiers
a21e679a1d
Make Lasers better at server-side
2015-03-18 20:52:58 +00:00
Ben Spiers
0307acc7eb
Fix sounds on the server side.
2015-03-18 20:52:58 +00:00
Aidan C. Brady
339e048a4e
After much client code isolation, there should be no more issues on the server side with sounds
2015-03-18 13:26:12 -04:00
Aidan
12b6b4610b
Merge pull request #2221 from halvors/development
...
Cleanup, cleared some warnings.
2015-03-18 08:55:37 -04:00
Halvor Lyche Strandvoll
97e51e0c26
Cleanup, cleared some warnings.
2015-03-18 13:51:14 +01:00
Aidan C. Brady
cc5080d908
Cleanup
2015-03-18 07:50:17 -04:00
Aidan C. Brady
1b813b4142
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2015-03-18 07:48:59 -04:00
Aidan C. Brady
398fa5d01a
Added that nullary constructor
2015-03-18 07:48:52 -04:00
