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

3618 commits

This branch
This branch
All branches
Author SHA1 Message Date
aidancbrady
1eff6ad6b8 Ship with CoFH energy API (as well as a few item tidbits). It's about time 2016-03-06 12:42:04 -05:00
aidancbrady
34d55f72ea More fluid container integration, removed dead code 2016-03-06 02:57:32 -05:00
aidancbrady
d332ad49b7 More consolidated fluid container management- I've been meaning to get to this for a long time 2016-03-06 02:15:56 -05:00
aidancbrady
d77de295f2 Modified factory-capable machine side data to match that of factories, allowing for configuration preservation 2016-03-05 19:33:02 -05:00
aidancbrady
b13d8ee1ab Fixed fluid duplication 2016-03-05 18:48:49 -05:00
aidancbrady
13996faacb Better particle rendering, bubbles when scuba tank is active, improved jetpack hover mode to disable when player is grounded 2016-03-05 18:28:52 -05:00
aidancbrady
4e41b46df7 Fix up Bin rendering 2016-03-05 15:18:40 -05:00
aidancbrady
866c76bafe Redesigned Filter Cards to serve as Configuration Cards, fixed inventory interaction bug, fixed Creative Energy Cube bug, added new recipes 2016-03-05 13:17:58 -05:00
aidancbrady
668643e663 Entangloporters work perfectly! 2016-03-04 21:58:13 -05:00
aidancbrady
f8f8dfa737 More work on entangloporters 2016-03-04 13:14:48 -05:00
aidancbrady
c03b712ed2 More work. I'm gonna let the configuration component determine send/receive instead of cluttering the GUI more 2016-03-04 12:07:34 -05:00
aidancbrady
8bd6b6e367 Merge branch 'master' into development 
* master:
  Part pt_BR update
 2016-03-04 11:06:31 -05:00
aidancbrady
ad15e359ac Work on Quantum Entangloporters. I get the feeling this is gonna be a big project 2016-03-04 11:06:05 -05:00
Aidan
833064b3ab Merge pull request #3117 from EzerArch/patch-1 
Part-update pt_BR lang
 2016-03-04 11:01:30 -05:00
EzerArch
679aa28dd3 Part pt_BR update 
Partial pt_BR locale update.
 2016-03-02 12:05:26 -03:00
Ezer Arch
e3d0b76d77 Merge pull request #1 from aidancbrady/master 
Sync
 2016-03-02 10:53:04 -03:00
aidancbrady
cfb0986a48 Added fancy graphs to display boil rate and max boil value of boilers, boiler valves now connect to corresponding tanks of multiblock based on location 2016-03-01 13:37:19 -05:00
aidancbrady
382116b659 Hopefully final build fix 2016-03-01 10:29:43 -05:00
aidancbrady
30fbfc32d6 Another try 2016-03-01 10:26:57 -05:00
aidancbrady
8b9098b350 Another build fix attempt 2016-03-01 10:25:06 -05:00
aidancbrady
4644e75202 Work on boiler stats panel, hopefully fix build 2016-03-01 10:22:24 -05:00
aidancbrady
1071f2fb4d Adjusted numbers, everything is now nice and balanced 2016-02-29 00:31:19 -05:00
aidancbrady
f09010a927 Many more fixes 2016-02-28 19:11:43 -05:00
aidancbrady
7c160cc264 Interface and rendering fixes 2016-02-28 18:11:50 -05:00
aidancbrady
c0f465d0cb Boiler rendering and interface, still yet to do statistics 2016-02-28 16:44:05 -05:00
aidancbrady
2451ac4819 Completed merge 2016-02-28 12:32:36 -05:00
aidancbrady
3d43a96f91 Merge branch 'master' into development 
* master:
  Fixed Induction Matrix issue
 2016-02-28 12:31:34 -05:00
aidancbrady
9d43e4ab49 Fixed Induction Matrix issue 2016-02-28 12:31:27 -05:00
aidancbrady
155758398c Continued boiler work 2016-02-28 11:52:52 -05:00
aidancbrady
87438dcc7f Boiler work, added heat info tab, worked on polishing heat interactions among machines 2016-02-27 13:32:48 -05:00
aidancbrady
9b9ed0a4c0 Polished resistive heaters, fixed a small bug in the sound system (a bit uncleanly) 2016-02-27 01:27:26 -05:00
aidancbrady
63335a57c8 Resistive heater is just about done! 2016-02-26 20:44:21 -05:00
aidancbrady
9d55f6cc8a Lots of work on resistive heaters, still mostly unfinished 2016-02-26 19:51:37 -05:00
aidancbrady
a31bc02e83 Merge branch 'master' into development 
* master:
  Update build number

Conflicts:
	build.properties
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/tools/common/MekanismTools.java
 2016-02-26 14:31:17 -05:00
aidancbrady
baf3ae6f59 Update build number 2016-02-26 14:30:49 -05:00
aidancbrady
d6f6625d83 A bit of work on resistive heaters 2016-02-26 09:28:19 -05:00
aidancbrady
b3143d1abb Thermodynamic Conductors function properly, added Thermal Evaporation Plant integration with heat system 2016-02-24 20:29:50 -05:00
aidancbrady
2d972edf45 Work on boilers 2016-02-24 17:42:12 -05:00
aidancbrady
3c1496740c Tiered Gas Tanks and tiered Fluid Tanks! 2016-02-24 17:01:43 -05:00
aidancbrady
08b6490bd3 Merge branch 'development' into v9 
* development:
  Update Danish locale
  Add Danish translation
  Made text more readable, fix some mistakes
 2016-02-23 16:06:51 -05:00
Aidan
e2c2bdacf3 Merge pull request #3107 from LordSheogarad/fixRuLang 
Update rus locale
 2016-02-23 16:05:11 -05:00
aidancbrady
85b3e49800 Merge branch 'master' into development 
* master:
  Update Danish locale
  Add Danish translation
 2016-02-23 16:05:00 -05:00
Aidan
e4a00cda77 Merge pull request #3109 from LFalch/LFalch-danish-translation 
Add Danish locale
 2016-02-23 16:04:40 -05:00
Lucas Falch
3fe65bdb3a Update Danish locale 
Correct mistakes and add missing translations
 2016-02-21 23:07:18 +01:00
Lucas Falch
693e7b5e8b Add Danish translation 
Still needs some extra polishing and testing
 2016-02-21 17:43:26 +01:00
LordSheogarad
18a22800b4 Made text more readable, fix some mistakes 2016-02-21 08:07:09 +05:00
aidancbrady
c9f0ed0941 Fix forestry sapling integration 2016-02-20 11:33:45 -05:00
aidancbrady
d72f4b6181 Don't mine fluid blocks 2016-02-20 11:25:38 -05:00
aidancbrady
0f59e722e1 Use Forge handlers for jetpack/scuba tank display bar instead of item damage 2016-02-20 11:07:54 -05:00
aidancbrady
279cccaa9b Merge branch 'development' into v9 
* development:
  Fixed chunk boundary acceptor interaction
 2016-02-19 18:09:14 -05:00