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

1759 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Aidan f9c19cc80e Merge pull request #1277 from BrunoLG/patch-1 
Update pt_BR.lang
 2014-05-04 12:21:14 -04:00
Aidan Brady 935be33fdf Hey guys, I'm back. Starting some work on the 1.7 port, thanks to @unpairedbracket for getting the brunt of the work done. 2014-05-04 12:19:43 -04:00
Richie 21b2ab7f12 Fixing the peripheral.wrap issue with CC 1.63 
Tested sucessfuly with Teleporters, Digital Miners and Factories.
 2014-04-28 19:34:41 +02:00
Richie 49cb1fcfff Made the inverse setting not reset each time you break/place the Digital Miner 2014-04-28 18:28:37 +02:00
Ben Spiers ef5737f546 Remove a bad import that was making gradle builds fail. 
Note: Things have changed in 6.1.0. If you're going to complain that I nerfed Hydrogen generation, don't update.
 2014-04-22 11:48:32 +01:00
Ben Spiers 3d8c5c8696 More fixes. Around 1000 errors now, going to have to leave it to you from here on in @aidancbrady. 2014-04-20 22:34:45 +01:00
Ben Spiers 31938e8b68 Under 1300 errors left now, started on packet/network stuffs. 2014-04-20 21:15:44 +01:00
Ben Spiers 86777694e5 Add Intellij project file to .gitignore. 2014-04-20 04:36:18 +01:00
Ben Spiers db7121454a Re-add an updated ic2, alter CC and update DepLoader. Fix more of the things. 
1792 errors. A good night's work, I think.
 2014-04-20 04:34:19 +01:00
Ben Spiers ab47724473 Move the directory structure around to a more conventional one and start out on the 1.7 update. 
3797 errors. We have a long way to go.
 2014-04-20 03:44:06 +01:00
Ben Spiers 08c374cb99 Oops. Missed that one 2014-04-19 21:22:25 +01:00
Ben Spiers 3a0de87a09 Remove some unused textures that I couldn't find being used any more. Remove the WIP label from the PRC texture. 2014-04-19 21:07:49 +01:00
Ben Spiers fd425b3146 I hereby declare this Mekanism 6.1.0! 2014-04-19 20:49:58 +01:00
Ben Spiers 36430cd52e Add tiered mechanical pipe recipes. 2014-04-19 20:30:36 +01:00
Ben Spiers 15a8cfe9db Work on un-screwing up NEI recipe GUIs. 2014-04-19 01:41:48 +01:00
Ben Spiers 3bde351458 Adjust some ratios, make ethylene's energy density a function of hydrogen's and biofuel's. 2014-04-18 22:21:23 +01:00
Ben Spiers af1e55f54b Remove some more unneccessary gui bits 2014-04-18 02:59:34 +01:00
Ben Spiers 95e8d2c5bb More gui work. I've just noticed this all has screwed up NEI. I'll try to sort that later. 2014-04-18 02:34:19 +01:00
Ben Spiers e92843dccb Reduce H2 energy density by factor 10 to make balance seem a bit more fair. 2014-04-17 02:11:05 +01:00
Ben Spiers 9d06fa91c1 Prepare some gui textures and texture sheets for upcoming GuiProgress. 2014-04-17 02:06:47 +01:00
Ben Spiers 9e76b3b473 Finish up some PRC stuff 2014-04-17 02:03:42 +01:00
Ben Spiers 676773eff7 Rename a method. 2014-04-17 02:02:25 +01:00
Ben Spiers e8769b4ffd Some Heat Generator changes: bring other fuels into line with lava buckets and provide a large passive boost in the nether. 2014-04-16 02:38:30 +01:00
Ben Spiers 97c5e98d91 Generators and Energy Cube Gui improvements. 2014-04-16 02:36:52 +01:00