SpaceToad
|
1d9dcd6ae2
|
Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x
|
2014-09-14 20:53:06 +02:00 |
|
SpaceToad
|
1ec9d92699
|
added variable timeout for schematic, down to 1. close #1971
|
2014-09-14 20:52:53 +02:00 |
|
SpaceToad
|
9fc636d272
|
Merge pull request #2020 from AEnterprise/6.1.x
fix progressbar in the lasertables
|
2014-09-14 16:46:35 +01:00 |
|
AEnterprise
|
dec9be8f51
|
fix progressbar in the lasertables
|
2014-09-14 17:44:15 +02:00 |
|
SpaceToad
|
2c5c282f2f
|
fixed potential integer overflow
|
2014-09-14 17:30:45 +02:00 |
|
SpaceToad
|
3d3085dd06
|
fixed precision loss in average computation, close #2016
|
2014-09-14 17:28:14 +02:00 |
|
SpaceToad
|
69ff44dc9f
|
Fixed wood pipe accepting energy from other pipes, following RF migration.
Part of #2016.
|
2014-09-14 16:59:07 +02:00 |
|
SpaceToad
|
b48cd579a3
|
Update README.md
Added a section on contributing regarding maintenance and residual bugs.
|
2014-09-14 16:37:34 +02:00 |
|
SpaceToad
|
2e76b90191
|
Merge pull request #2018 from AEnterprise/6.1.x
fix MJ->RF migration with blocks that where already in the world
|
2014-09-14 15:25:34 +01:00 |
|
AEnterprise
|
aab946140b
|
fix style, remove unnecesairy check
|
2014-09-14 16:18:57 +02:00 |
|
AEnterprise
|
5e526416c4
|
fix MJ->RF migration with blocks that where already in the world
|
2014-09-14 15:58:37 +02:00 |
|
SpaceToad
|
fca62af54b
|
fixed style
|
2014-09-14 15:44:38 +02:00 |
|
SpaceToad
|
bc317bdec0
|
Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x
|
2014-09-14 15:43:20 +02:00 |
|
SpaceToad
|
4e843c5104
|
fixed deadlock when getting properties from main thread
|
2014-09-14 15:43:09 +02:00 |
|
SpaceToad
|
15e6c36813
|
Merge pull request #2017 from AEnterprise/6.1.x
fixes for construction marker
|
2014-09-14 14:27:58 +01:00 |
|
AEnterprise
|
1ef8640417
|
no need to compute item if not droped
|
2014-09-14 15:15:44 +02:00 |
|
AEnterprise
|
903ec1c107
|
fix blueprint not dropping form construction marker
fix construction marker accepting more then 1 blueprint
|
2014-09-14 13:16:27 +02:00 |
|
SpaceToad
|
b906f7b7a8
|
attempt at moving MJ => RF units, for #2015
|
2014-09-14 12:30:04 +02:00 |
|
SpaceToad
|
ff527353c5
|
fixed save / load of input/output states, fix #2011
|
2014-09-14 10:57:49 +02:00 |
|
SpaceToad
|
cdd9ae1199
|
fixed indentation
|
2014-09-14 10:44:27 +02:00 |
|
SpaceToad
|
55f4efb65c
|
re-activated engine pumping, following RF migration
|
2014-09-14 10:27:15 +02:00 |
|
SpaceToad
|
93961e9d9e
|
fixed powered tile detection for engines, following RF migration
|
2014-09-14 09:41:11 +02:00 |
|
SpaceToad
|
411ec984f0
|
fixed icon setting
|
2014-09-14 09:40:46 +02:00 |
|
SpaceToad
|
b268433b4c
|
fixed RF battery save / load
|
2014-09-13 10:57:29 +02:00 |
|
SpaceToad
|
fd8d8531a1
|
Merge pull request #2014 from AEnterprise/6.1.x
create events for external research
|
2014-09-13 09:42:18 +01:00 |
|
AEnterprise
|
4cdfa5cddd
|
more cleanup
|
2014-09-11 16:43:05 +02:00 |
|
AEnterprise
|
75079f2d9a
|
fix indentation
|
2014-09-11 12:36:14 +02:00 |
|
AEnterprise
|
0a716a96bb
|
Fix indentation
|
2014-09-11 09:30:11 +02:00 |
|
AEnterprise
|
35213b643a
|
last style errors
|
2014-09-10 15:26:35 +02:00 |
|
AEnterprise
|
1da9ec0a26
|
second attempt at fixing style
|
2014-09-10 15:18:23 +02:00 |
|
AEnterprise
|
6b76b63ba7
|
fix style
|
2014-09-10 14:56:17 +02:00 |
|
AEnterprise
|
cfb63644b4
|
create events for external research
|
2014-09-10 14:43:06 +02:00 |
|
SpaceToad
|
d67b916ab9
|
Merge pull request #2011 from RufusStark/6.1.x
Quartz Fluid Pipe and Flow Rate Multiplier
|
2014-09-09 07:15:07 +01:00 |
|
RufusStark
|
7a436c5a31
|
ActionValve and ActionParameterDirection
|
2014-09-08 21:41:48 -05:00 |
|
SpaceToad
|
f38a299702
|
fixed handling of energy for robot load and robot steam
|
2014-09-07 13:07:00 +02:00 |
|
SpaceToad
|
fd928abbfc
|
added missing construction mark name
|
2014-09-07 13:04:39 +02:00 |
|
SpaceToad
|
579252a473
|
Further progress on composite blueprints (#1544).
Markers now display if they're recording a composition or not.
Architects save / load their sub-blueprints.
Composition links have a maximum reach.
|
2014-09-07 11:52:15 +02:00 |
|
SpaceToad
|
f814fa67f7
|
implemented capture of existing blueprints for composition, for #1544
|
2014-09-07 10:50:20 +02:00 |
|
RufusStark
|
2f17a302e7
|
Merge remote-tracking branch 'upstream/6.1.x' into 6.1.x
|
2014-09-06 20:06:52 -05:00 |
|
SpaceToad
|
416180819b
|
improved laser rendering for composite architects, #1544
|
2014-09-06 18:51:49 +02:00 |
|
SpaceToad
|
b9f10af73b
|
fixed orientation of sub-blueprints, for #1544
|
2014-09-06 17:55:45 +02:00 |
|
SpaceToad
|
66e5e8387d
|
fixed anchor rotations, for #1544
|
2014-09-06 17:44:18 +02:00 |
|
SpaceToad
|
0381a4edd0
|
Merge branch '6.0.x' into 6.1.x
Conflicts:
build.gradle
common/buildcraft/transport/render/FacadeItemRenderer.java
|
2014-09-06 12:32:59 +02:00 |
|
SpaceToad
|
89c9d0f34b
|
Merge branch 'Prototik-iron-engine' into 6.1.x
|
2014-09-06 12:29:16 +02:00 |
|
SpaceToad
|
a703d946b1
|
Merge branch 'iron-engine' of github.com:Prototik/BuildCraft into Prototik-iron-engine
Conflicts:
common/buildcraft/energy/TileEngineIron.java
|
2014-09-06 12:28:50 +02:00 |
|
SpaceToad
|
51f2e5a787
|
Merge pull request #2000 from Prototik/facade-renderer-npe
Fix strange npe in facade item renderer
|
2014-09-06 12:22:22 +02:00 |
|
SpaceToad
|
ca9a9ec4a4
|
made progress with composite blueprints, for #1544
|
2014-09-06 11:49:52 +02:00 |
|
RufusStark
|
164adbb88e
|
flow rate multipliers
|
2014-09-06 03:12:03 -05:00 |
|
SpaceToad
|
cca8fd2c0c
|
removed cofh from checked files
|
2014-09-04 21:24:24 +02:00 |
|
SpaceToad
|
9f71fdfe0e
|
fixed style
|
2014-09-04 20:55:50 +02:00 |
|