tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
3184 commits 2 branches 0 tags 102 MiB
Commit graph

1530 commits

Author SHA1 Message Date
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
63f751c710 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2015-04-03 10:14:33 -04:00
mymagadsl
b423a1d2b9 Update zh_TW.lang 2015-04-02 17:48:23 +08: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
20a91e655f Merge pull request #2439 from Vexatos/patch-8 
Update de_DE.lang
 2015-04-01 13:10:30 -04:00
Vexatos
e12290b540 Fixed en_US.lang 2015-04-01 19:02:10 +02:00
Vexatos
1f056925cb Update de_DE.lang 2015-04-01 19:01:27 +02:00
Vexatos
abbca5ffd1 Update de_DE.lang 2015-04-01 18:59:48 +02:00
Aidan C. Brady
1bce16b1ad Localization fix 2015-04-01 11:09:15 -04: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
Vexatos
f4ec705b32 Fixed Mekanism API 2015-03-31 15:11:45 +02: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
6ce51b0b8d Finished Reactor Logic Adapter 2015-03-29 16:02:57 -04:00
Aidan C. Brady
7d521ea841 Logic adapter work 2015-03-29 15:23:13 -04:00
Aidan C. Brady
0f54c21cf2 More work on logic adapter 2015-03-29 14:47:09 -04:00
Aidan C. Brady
78ed108904 Merge branch 'development' into v8.1 2015-03-29 14:20:11 -04:00
Aidan C. Brady
3a6529eac5 Fixed a reactor crash 2015-03-29 14:17:39 -04:00
Aidan C. Brady
834913f5a4 Work on Reactor Logic Adapter 2015-03-29 14:17:04 -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
a87fb35c2c Merge branch 'master' into development 2015-03-29 11:02:47 -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
Mr-tanaka3
0f5788d7e1 Update ja_JP.lang 2015-03-29 22:04:26 +09: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
cd323920fe Fixed Crusher texture 2015-03-29 00:12:49 -04:00
Aidan C. Brady
2605751af0 Added some nicer tooltips to Oredictionificator interfaces 2015-03-28 23:51:38 -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
3e4fe02449 Fixed Teleporter Frame asset 2015-03-28 17:41:48 -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
fba7fb34f0 Fixed ItemRetriever 2015-03-27 12:49:29 -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
b15499f465 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-03-26 18:09:02 -04:00
Aidan C. Brady
2546d9c28e Bump version to 8.0.3 2015-03-26 18:08:56 -04:00
Aidan
e5e7a5568f Merge pull request #2382 from TheVikingWarrior/patch-2 
Update it_IT.lang
 2015-03-26 17:55:32 -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
TheVikingWarrior
b5635023d0 Update it_IT.lang 2015-03-26 22:16:10 +01: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
84088506e0 Hopefully fixed an issue 2015-03-25 14:10:07 -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
e47f6032c1 Localization fixes 2015-03-24 11:39:25 -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
1cc277f2d9 Wind Turbine spinning animation is now much smoother and dependent only on height 2015-03-24 10:53:45 -04:00
Aidan C. Brady
0a14d064f3 Push matrix in item renderer 2015-03-24 10:36:56 -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
f6f75e6ea1 Crash fix 2015-03-23 22:00:43 -04:00
Aidan C. Brady
5513859216 Cleanup, updated IC2 API 2015-03-23 20:34:43 -04:00
Aidan
8f0243d4b1 Merge pull request #2331 from halvors/minerfix 
Fixed OreDictionary filter in Miner not writing "requireStack" to NBT.
 2015-03-23 19:42:28 -04:00
Aidan C. Brady
540955ef4f Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-03-23 19:41:33 -04:00
Aidan C. Brady
2e79f61642 Fixed Seismic Reader reading wrong x and z coords 2015-03-23 19:41:27 -04:00
Halvor Lyche Strandvoll
b49810e310 Merge remote-tracking branch 'aidancbrady/development' into development 2015-03-24 00:34:02 +01:00
Halvor Lyche Strandvoll
7409a83088 Fixed OreDictionary filter in Miner not writing "requireStack" to NBT. 2015-03-24 00:32:04 +01:00
TheVikingWarrior
652458617c Create it_IT.lang 
Initial translation done, need to finish the tooltips and modules, and also control some stuff and if some of the GUIs fit in the machines
 2015-03-23 22:13:35 +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
Aidan C. Brady
4354357462 Added a null check 2015-03-22 21:41:59 -04:00
Aidan C. Brady
735217961c Fixed Configurator tooltip, fixed a major packet issue 2015-03-22 21:40:23 -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
Ben Spiers
dfefcaf69a Fix #2303 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
e31d5573f1 Heat Generator now shows exact heat generation amount in GUI 2015-03-22 01:00:38 -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
Ben Spiers
a7c812bc6e Reduce paramaters of the reactor for more challenging balance. 
Now requires 1GJ to ignite, and produces half as much power in passive mode.
The product of thermocouple efficiency and the laser input bonus must not be more than 1, (was previously 10) or energy from a laser that is absorbed (multiplied by the bonus coefficient) then propagates through the code and is multiplied by the thermocouple efficiency will come out bigger than it went in.
This would make the most efficient usage of a reactor simply shining a laser at it and pulling power out, producting net +49.5kJ/t.
This is now rectified, the product of bonus and thermocouple is now 0.5.
 2015-03-22 02:16:17 +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
283053dab9 Fix a texture (rgb profile?) issue 2015-03-21 21:43:44 +00: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
84a1fa95ae Require a Hohlraum filled up to the max with D-T fuel in order to trigger a reaction 2015-03-21 12:44:37 -05:00
Aidan C. Brady
46eb5aa288 Fixed Hohlraum check crash 2015-03-21 12:42:41 -05:00
Aidan C. Brady
79d319cc87 Fixed temperature units 2015-03-21 11:51:11 -05: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
Aidan C. Brady
123199a689 Merge branch 'master' into development 2015-03-20 20:29:04 -05:00
Aidan
7c7007e2c4 Merge pull request #2270 from Mr-tanaka3/master 
Update ja_JP.lang
 2015-03-20 20:27:27 -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
82c355cb86 Added a null check for transitions 2015-03-20 17:37:22 -05: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
caab819663 Fixed Fluid Gauge crash 2015-03-20 12:15:07 -04:00
Aidan
1914c1cdfc Merge pull request #2252 from halvors/translation 
Added Norwegian translation
 2015-03-20 10:37:57 -04:00
Halvor Lyche Strandvoll
4beea9481a Added no_NO.lang 2015-03-20 15:35:04 +01:00
Aidan
fe80ecb190 Merge pull request #2251 from Adaptivity/development 
Update ru_RU.lang
 2015-03-20 10:18:23 -04:00
Anton
5635a72745 Update ru_RU.lang 2015-03-20 16:28:39 +03:00
Vexatos
85fe0fa129 Update de_DE.lang 2015-03-20 13:43:28 +01:00
Vexatos
2d9e094c85 Re-added comments to de_DE.lang 2015-03-20 13:39:35 +01:00
Vexatos
46f013c35b Update de_DE.lang 
Comments will come back later today. I was in a hurry
 2015-03-20 06:57:54 +01: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
857954575a Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-03-20 01:30:17 -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
Mrkwtkr
f03c9bd03a Update zh_CN.lang 2015-03-20 13:10:13 +08: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
Mr-tanaka3
739e8f95e3 Update ja_jp.lang 2015-03-20 10:42:32 +09: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
2a3ddd014b Remove FMLRenderAccessLibrary reference 2015-03-19 16:41:07 +00:00
Ben Spiers
b69e6a9d80 Make temperatures consistent. 2015-03-19 16:41:07 +00:00
Aidan C. Brady
9c6708660b Fixed Metallurgic Infuser tooltip 2015-03-19 09:28:50 -04: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
35b3ec365f Fix a reactor controller serverside crash 2015-03-19 00:43:07 +00: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
Ben Spiers
eb5e8b0cca Make the reactor use Hohlraums properly 2015-03-18 20:47:31 +00:00
Aidan C. Brady
143777ae6e Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-03-18 14:32:00 -04: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
Anton
c02724d40f Update ru_RU.lang 2015-03-18 18:03:29 +03: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
Ben Spiers
4e3999ea9c Make the rendering of Induction Matrix internals a bit nicer. 2015-03-18 01:32:35 +00:00
Ben Spiers
60a32d44f6 CTM for the Induction Matrix internals. @aidancbrady, what do you think? 
Feel free to revert if you preferred it how it was.
 2015-03-18 01:10:52 +00:00