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

2700 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aidan 4ffd064c06 Merge pull request #2073 from Adaptivity/patch-4 
Update ru_RU.lang
 2015-02-08 16:25:45 -05:00
Aidan 021f7a1bb7 Merge pull request #2062 from BrunoLG/patch-7 
Update pt_BR.lang
 2015-02-08 16:25:40 -05:00
Sakarias Longhorn cde1ab3967 Update fr_FR.lang 2015-01-29 17:24:43 +01:00
Rich Jeanes a9e71c985c Update README.md 
Grammar
 2015-01-22 09:24:17 -07:00
Al a2d79d5ca5 Update pt_BR.lang 
Fixed: "Paxel"

Minecraft vanilla:
item.leggingsCloth.name=Leather Pants
item.leggingsCloth.name=Calça de Couro (pt_BR)
 2015-01-21 09:37:08 -03:00
Ben Spiers 3e38ac37f4 This feature request has been more trouble than it's worth. 2015-01-19 12:16:04 +00:00
Ben Spiers 2ced2e3860 Fix the bad implementation of the ambient lighting toggle 2015-01-19 12:07:54 +00:00
Ben Spiers 1f9185dd01 Make the gas mask and jetpack maps synchronized 2015-01-10 18:17:17 +00:00
Ben Spiers 89be8b4482 Fix using localised names for overlay textures. 2015-01-10 17:47:16 +00:00
Ben Spiers 1a6a2e9530 Update version number. 
I'm going to use GitHub's release feature until the build server's fixed.
 2015-01-10 17:13:35 +00:00
Ben Spiers 143c968a8a Update some deps to see if the buildserver's fixed yet 2015-01-10 03:19:31 +00:00
Ben Spiers b8b49db104 It seems the Heat Transfer equations I'm using are a bit stiff. 
Adjust some paramaters some to improve how well we deal with this.
 2015-01-09 02:50:18 +00:00
Ben Spiers aa91fa87a6 Update some dependencies. 2015-01-08 05:27:08 +00:00
Ben Spiers 385a1d29f6 Make a start on the boiler. 
It's currently causing odd issues with the heat simulator and has various issues such as balance not existing yet.
Also improve the specification of a load of the multiblock generics to reduce needless casting.
 2015-01-08 05:26:53 +00:00
Ben Spiers c0db6b7eb5 Fix #2075, hopefully. 2015-01-07 23:58:23 +00:00
Ben Spiers 41cf1a2437 Move a bunch of registrations to PreInit. 
I believe they should be happening there in the first place.
 2015-01-07 23:13:45 +00:00
Ben Spiers 4b75a2f6a2 Hopefully improve the synchronization of the networks' transmitter sets 2015-01-07 23:13:10 +00:00
Anton 36d3d1bdb2 Update ru_RU.lang 2015-01-05 18:22:34 +03:00
Ben Spiers 5e9131a59f Seems gradle was having language level issues. 
Everybody better be using java 7 by now, get with the times people.
 2014-12-30 19:43:11 +00:00
Ben Spiers fdde129180 Obfuscate password entry 2014-12-28 23:01:26 +00:00
Ben Spiers 3d4636d8da Config option for generator lighting 2014-12-27 21:37:20 +00:00
Ben Spiers f419c4e6d5 Fix anvil and snow pickup 2014-12-27 21:26:20 +00:00
Ben Spiers aea27f3bd6 Merge pull request #2029 from SoraZodia/master 
@Interface removal for IPipeTile
 2014-12-27 21:17:42 +00:00
Ben Spiers f63807c75a Fix some transmitter issues. 2014-12-27 21:09:34 +00:00
Ben Spiers ccf7a37b22 Make HeatUtils not take unnecessary arguments. 2014-12-27 21:08:18 +00:00
BrunoLG 7a69f96ae2 Update pt_BR.lang 2014-12-27 13:16:14 -02:00
Ben Spiers d4f48401d3 Merge branch 'development' into v8 2014-12-22 23:46:17 +00:00
Ben Spiers c77e84ca6c Make cyan brighter 2014-12-22 23:41:33 +00:00
Ben Spiers fe2c22862a Fill in some machines' type arguments. 2014-12-22 23:40:51 +00:00
Ben Spiers 00fa5ccbe6 Make the heat methods not crash. 2014-12-22 23:40:29 +00:00
Ben Spiers 37e35d5943 Make loading the reactor from file update the "last" temperatures. 2014-12-22 23:40:03 +00:00
Ben Spiers f3d9faff6b Make it dangerous to be in the reactor while it is at >100million degrees, and full of burning plasma. 2014-12-22 23:38:32 +00:00
Ben Spiers bc1ef33cd6 Make unforming the fusion reactor stop the burn. 2014-12-22 23:36:37 +00:00
Ben Spiers 7296c3dbcb Reactors now a Heat source. Awaiting Balance. 2014-12-22 21:30:45 +00:00
Ben Spiers 3544addf20 Make heat generator not lose energy when below ambient temperature, and use the Carnot Engine equations for efficiency. 2014-12-22 20:10:01 +00:00
Ben Spiers 8a4aaff44a Move standard simulation method into a Utils class. 2014-12-22 19:38:03 +00:00
Ben Spiers ab2a7cb6c7 Improve temperature colours to allow for different base colours. 
Make a start on insulation.
Code the characteristics of air into static IHeatTransfer variables.
 2014-12-22 19:14:55 +00:00
Ben Spiers 7214a88a7a Make network reader not use energy when in creative mode. 2014-12-20 02:09:55 +00:00
Ben Spiers 4a404dfc78 Improve Heat mechanic, and get it rendering nicely. 
Colour temperature algorithm adapted from http://www.tannerhelland.com/4435/convert-temperature-rgb-algorithm-code/ - thanks to Tanner Hellan for the useful post.
 2014-12-20 02:09:14 +00:00
Ben Spiers 2bd2e94c7b Heat Generator changed to use the new heat mechanic. Not balanced or anything yet, more a proof of concept. 2014-12-19 04:49:15 +00:00
Ben Spiers bb937fdd53 Heat Transmission. 2014-12-19 04:46:23 +00:00
Ben Spiers b5f3d77b83 Making a start on Gas Centrifuge. 2014-12-19 02:23:42 +00:00
Ben Spiers 5dc0e5dca1 Merge branch 'development' into v8 2014-12-18 23:01:31 +00:00
Ben Spiers 6aa84d1388 Merge branch 'master' into development 
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityPortableTank.java
 2014-12-18 22:56:26 +00:00
Ben Spiers 1ce56d09e2 Fix Portable Tank NPE 2014-12-18 22:53:24 +00:00
Ben Spiers fd0bdd4da8 Efficiency of isValidAcceptor methods. 2014-12-18 22:52:45 +00:00
Brian Lewis b95836e6be Merge remote-tracking branch 'upstream/master' 2014-12-18 08:50:53 -06:00
Ben Spiers b5e289b504 Merge branch 'development' into v8 2014-12-16 20:35:55 +00:00
Ben Spiers 6e422151be Merge branch 'master' into development 2014-12-16 20:34:55 +00:00
Ben Spiers 9a6b3c511e Fix a silly mistake 2014-12-16 20:33:23 +00:00