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

1983 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anton
e806004db7 Update pt_BR.lang 2014-06-09 09:37:44 +04:00
Anton
38b6765292 Update zh_CN.lang 2014-06-09 09:37:08 +04:00
Anton
60eb2944f7 Update zh_TW.lang 2014-06-09 09:35:49 +04:00
Anton
68c64cf44d Update ru_RU.lang 
DON'T MERGE YET
 2014-06-09 09:34:57 +04:00
Aidan C. Brady
75bd49de9d Buffed Salination Plant's water usage 2014-06-08 17:39:57 +02:00
Aidan C. Brady
0bb98442b8 Fixed a silly bug 2014-06-08 16:51:02 +02:00
Aidan C. Brady
d436c70421 Merge branch 'master' into development 
Conflicts:
	build.gradle
	build.properties
	common/mekanism/common/network/PacketPortableTeleport.java
	common/mekanism/tools/common/MekanismTools.java
	etc/core/mcmod.info
	etc/generators/mcmod.info
	etc/tools/mcmod.info
	src/main/java/mekanism/common/EnergyNetwork.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/PacketHandler.java
	src/main/java/mekanism/common/network/PacketTransmitterUpdate.java
	src/main/java/mekanism/common/tile/TileEntityChargepad.java
	src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
	src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
 2014-06-08 12:01:08 +02:00
Aidan C. Brady
ba04ed146f Mekanism v6.0.5 - contains many major fixes, many of which were backported from the 1.7 branch 2014-06-08 11:47:02 +02:00
Aidan C. Brady
c72e1c6efc Work on transmitters 2014-06-08 01:17:47 +02:00
Aidan C. Brady
b387c8529d Bumped version to 7.0.0, a few fixes and enhancements 2014-06-06 00:16:36 +02:00
Aidan C. Brady
d1c3b3b8ef Manually merged riches' PR 2014-06-04 11:05:29 +02:00
Aidan C. Brady
a973ef118c Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-06-04 03:07:23 +02:00
Aidan C. Brady
1137b9514a Quick fix for Tellurium 2014-06-04 03:07:08 +02:00
Aidan
96a52dd606 Merge pull request #1373 from Vexatos/patch-2 
Update de_DE.lang
 2014-06-04 03:02:19 +02:00
Aidan C. Brady
91cd34b7d3 Harvest levels! Yeah! 2014-06-04 02:57:33 +02:00
Aidan C. Brady
bda4f8cfe5 Fixed Walkie Talkies 2014-06-04 02:38:39 +02:00
Aidan C. Brady
f0d3848f8a Sounds work! Also got tick handlers set up, still have to do a few things 2014-06-03 20:57:59 +02:00
Aidan C. Brady
815944c49a A major load of fixes - things should be about back to normal now. 2014-06-03 19:54:45 +02:00
Aidan C. Brady
322301c301 Added RecipeSorter registrations, fixed a few things 2014-06-03 11:25:12 +02:00
Aidan C. Brady
b365494f2e Fixed up logger, added needed overlays 2014-06-03 08:46:03 +02:00
Aidan C. Brady
9a16625585 Updated build.gradle 2014-06-03 00:25:46 +02:00
Aidan C. Brady
5b611c9cdb 0 errors. This is it, the first building build of Mekanism for 1.7.2, and also the most buggy build of Mekanism to date most likely. 
(I remembered to update the obfuscated reflections, so there's that)
 2014-06-03 00:21:00 +02:00
Aidan C. Brady
4446e14ba3 Sound system work 2014-06-02 23:57:40 +02:00
Aidan C. Brady
295efab7b2 More error fixes, down to 11! 2014-06-02 20:04:10 +02:00
Aidan C. Brady
1933723b52 Major packet work, I think it's done. 34 errors to go! 2014-06-02 17:33:19 +02:00
Aidan C. Brady
659b963af6 Alright, almost done with network changes (63 errors!) 2014-06-02 16:52:13 +02:00
Aidan C. Brady
84055986d0 About halfway through netty conversion 2014-06-02 16:01:21 +02:00
Aidan C. Brady
ec2040cccc Work on networking update 2014-06-01 17:42:23 +02:00
Vexatos
ea3f340cdf Update de_DE.lang 2014-06-01 14:30:49 +02:00
Aidan C. Brady
da444327f8 A bit of work on sounds 2014-05-31 22:42:02 +02:00
Aidan C. Brady
8be5ecf140 Down to 215 errors, pretty much everything is packets now 2014-05-30 23:49:24 +02:00
Aidan C. Brady
fa0c2e6f12 More bits of work 2014-05-30 23:10:05 +02:00
Aidan C. Brady
bd7b8f75e0 Merge branch 'master' into development 2014-05-30 21:52:32 +02:00
Aidan
05995dbaaa Merge pull request #1359 from dschub/master 
Fix Logistical Transporter Item Loss (#1353)
 2014-05-30 08:02:15 -04:00
Aidan C. Brady
d1c193d0dd Loads more work. 275 errors. 2014-05-29 19:01:43 +01:00
Aidan C. Brady
6f69c6d7b4 Major 1.7 work, down to a little more than 500 errors 2014-05-29 17:55:47 +01:00
dschub
17c8874bc2 Fix Logistical Transporter Item Loss (#1353) 2014-05-28 16:23:48 +02:00
Aidan C. Brady
1d22ddadc3 Merge branch 'master' into development 
Conflicts:
	build.gradle
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/tools/common/MekanismTools.java
 2014-05-17 11:47:18 -04:00
Aidan
5a830699e7 Merge pull request #1334 from ngreatorex/ncg 
Change Digital Miner GUI to show actual energy usage per tick
 2014-05-17 11:36:07 -04:00
Neil Greatorex
db20084f41 Change Digital Miner GUI to show actual energy usage per tick 2014-05-09 22:00:05 +01:00
Aidan Brady
6025572f15 Merge branch '1.7' into development (We're back to two branches) 
Conflicts:
	build.properties
 2014-05-08 17:40:27 -04:00
Aidan Brady
0606d6d29f Actual 6.0.4 release 2014-05-08 17:36:41 -04:00
Aidan Brady
7496ac7648 Some 1.7 work. Just about 800 errors! 2014-05-07 16:37:58 -04:00
Aidan
e20674dfff Merge pull request #1330 from tterrag1098/1.7 
Some 1.7 work
 2014-05-07 16:22:19 -04:00
tterrag1098
6ac750520c Blocks and Entities 2014-05-06 03:14:44 -04:00
tterrag1098
321fa4ed50 Some work on GUIs, mostly sfx 2014-05-06 02:57:39 -04:00
Aidan Brady
750d468822 Merge branch 'master' into development 2014-05-04 12:22:12 -04:00
Aidan
533e04ded7 Merge pull request #1320 from richie3366/master 
Digital Miner fix & CC 1.63 integration fix
 2014-05-04 12:22:11 -04:00
Aidan
5c0e7532b6 Merge pull request #1286 from tterrag1098/patch-5 
Armored jetpack now gives a reasonable amount of protection
 2014-05-04 12:21:26 -04:00
Aidan
2a83f00de8 Merge pull request #1285 from Vexatos/patch-1 
Update de_DE.lang
 2014-05-04 12:21:19 -04:00