Adrian
1e58f6f69e
add tooltips to filler and emerald transport pipe
2015-06-16 17:16:15 +02:00
Adrian
6abc40ed48
add excavation option to the filler, BuildCraft 7.0.11
2015-06-16 17:06:11 +02:00
asiekierka
79ca53e1bc
BuildCraft 7.0.10
2015-06-16 08:06:34 +02:00
asiekierka
0815e5f118
optimize blueprint array, add hollow option to cylinders, move pattern icons to items
2015-06-15 13:08:59 +02:00
Adrian
e2474bd526
cleanup, add changelog
2015-06-14 15:03:06 +02:00
Adrian
81dea5a6fd
add center selection to pyramid code
2015-06-14 14:58:09 +02:00
Adrian
6c3d6f4e1b
Stairs pattern fixed ( #2796 ), added stair direction setting
2015-06-14 14:13:17 +02:00
asiekierka
085dff9876
clean things up, prepare for 7.0.9
2015-06-11 09:26:14 +02:00
Adrian
dc090c0e46
fix many minor things, fix #2743 , add changelog
2015-06-10 14:01:34 +02:00
Adrian
0f6b089d26
BuildCraft 7.0.8
2015-06-07 12:34:26 +02:00
Adrian
373af4dcc0
BuildCraft 7.0.7
2015-06-07 10:44:26 +02:00
Adrian
211cf27a68
fix #2762
2015-06-07 08:43:43 +02:00
Adrian
8e344b3f91
fix #2758
2015-06-06 21:26:55 +02:00
Adrian
47cba60750
fix #2751 , fix #2752 , fix #2754 , fix #2755 , fix stacking on packager pattern slots
2015-06-06 16:09:01 +02:00
Adrian
e83d370a2f
fix mining well schematic, dia. fluid pipe color
2015-06-06 14:35:44 +02:00
Adrian
dc23cacf46
BuildCraft 7.0.6 Stable
2015-06-06 08:47:03 +02:00
Hea3veN
72d4ad5ada
add the ability to scroll through the parameters of the Forbid/Force robot
2015-06-05 21:47:20 -03:00
Hea3veN
1f33864dae
fix picker robot hanging on unreachable items
2015-06-05 20:00:48 -03:00
Adrian
3ad6c673ff
make lists more expensive if Silicon present, add deprecation warning to ACT
2015-06-05 21:47:30 +02:00
Adrian
35066fed79
move alts from resources, fix colorblind diamond pipe gui colors
2015-06-05 21:30:46 +02:00
Adrian
3558d228de
update changelog
2015-06-05 13:17:54 +02:00
Adrian
32a4bbd828
fix gold pipe texture
2015-06-05 13:07:32 +02:00
Adrian
7bed0a6227
correct iron/emzuli/clay pipe textures, charging table; use one weird trick for better pipe rendering
2015-06-05 07:44:43 +02:00
Hea3veN
dbb9781686
add colorblind textures for the docking stations
2015-06-04 20:32:25 -03:00
Hea3veN
9286f76dd5
fix some robots not going to sleep if they fail to equip items
2015-06-04 19:59:07 -03:00
Hea3veN
dfaf820db9
more config localization
2015-06-04 19:54:09 -03:00
Hea3veN
eec2022b7c
fix the rendering of helmets on robots, fixes #2741
2015-06-04 19:53:41 -03:00
Adrian
8b04ce6e12
pipe color correction
2015-06-04 17:50:32 +02:00
Adrian
8fb72d7274
push new builder top on texture
2015-06-04 16:28:42 +02:00
Hea3veN
c889032d00
fix the builder robot not respecting the working area
2015-06-02 21:35:04 -03:00
Hea3veN
500207a00d
fix robots not keeping their energy when being reprogrammed and make new robots start with a small amount of energy
2015-06-02 19:48:17 -03:00
Hea3veN
f8290b947c
add light sensor textures
2015-06-01 21:23:17 -03:00
Adrian
ccc26b15ff
clean up and fix laser texture and rendering
2015-06-01 11:47:59 +02:00
Adrian
bb699a823d
packager: only allow inserting items which are either already in the packager or important to the recipe; stamper: add container item support
2015-06-01 11:33:08 +02:00
Hea3veN
29a3340aa2
fix missing textures errors
2015-05-31 13:05:46 -03:00
Hea3veN
d8224f5edb
add a loop mode to the quarry, fixes #2709
2015-05-29 08:29:51 -03:00
Hea3veN
c686cf7e8d
Restore config option to make filler/builder drop blocks, fixes #2692
2015-05-29 01:09:12 -03:00
Hea3veN
adaab2ed3c
start cleaning up getting ready for a stable release
2015-05-29 01:09:12 -03:00
Hea3veN
f2da4f1a08
fix client/server desync on the gate copier item, fixes #2694
2015-05-27 23:09:53 -03:00
Hea3veN
1e679001f0
fix robots converting fluids when filling their tank, fixes #2729
2015-05-27 21:25:02 -03:00
Hea3veN
b4f237c795
fix gate expansion recipe ignoring the input's stack size
2015-05-27 20:39:14 -03:00
Hea3veN
499bd99735
fix integration table using energy when it has an invalid recipe, fixes #2730
2015-05-27 20:30:34 -03:00
Adrian
00562c5adb
BuildCraft 7.0.5
2015-05-26 15:37:04 +02:00
Adrian
0027ac8fcf
fix graphics bugs, new pipe plug/structure pipe/robot station textures
2015-05-23 10:46:03 +02:00
TheVikingWarrior
9c63dbdb7b
Fixed typo
2015-05-14 19:21:19 +02:00
Adrian
8570b2b58a
fix fluid pipe sync, BuildCraft 7.0.4
2015-05-10 11:30:38 +02:00
Adrian
d8070e9baa
update changelog
2015-05-08 21:10:18 +02:00
Adrian
db002ea714
style changes, add /buildcraft changelog, add missing files
2015-05-07 19:26:25 +02:00
Adrian
d732d4ee11
add scrollbar to builder, improve GUI rendering
2015-05-07 05:56:31 +02:00
Adrian
c363707bfd
fix #2697 , add changelog
2015-05-06 23:33:02 +02:00
Adrian
81ac1bc77d
Stop pretending to be EE3.
2015-05-06 20:21:28 +02:00
Adrian
d0e5807c35
push resources, increase assembly table output size to 3x4, fix ledger icon blending bug
2015-05-06 20:03:45 +02:00
Adrian
1ac9cadca9
some refactoring, new Integration Table
2015-05-06 07:46:20 +02:00
asiekierka
f23ff7ac2e
final BC 7.0.3 commit
2015-05-02 15:40:47 +02:00
asiekierka
4b9db3bdbb
Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x
2015-05-02 15:37:38 +02:00
asiekierka
00b0b97e3a
BuildCraft 6.4.14
2015-04-28 20:27:18 +02:00
asiekierka
7c2a25b9be
add some missing localizations ( #2665 )
2015-04-28 20:16:38 +02:00
asiekierka
eea3c12c3e
add some missing localizations ( #2665 )
2015-04-28 18:50:14 +02:00
asiekierka
e749c6f36b
implement #2672 , add color-coding and percentage to robot charge
2015-04-27 17:04:42 +02:00
asiekierka
d8b302eee0
refactor: move all robot NBT classes into a single class
2015-04-27 16:53:28 +02:00
asiekierka
5cdedf9deb
add #2627 , FluidSpilledEvent; BC 7.0.2
2015-04-25 14:16:06 +02:00
asiekierka
e2033f5cea
fix #2661 , add changelog
2015-04-25 12:52:19 +02:00
asiekierka
3cb5a3de27
Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x
2015-04-22 18:57:41 +02:00
asiekierka
4a72ddc20f
6.4.13
2015-04-22 18:51:12 +02:00
asiekierka
7f03a920bb
Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x
2015-04-22 16:26:50 +02:00
asiekierka
28bb9639e1
BuildCraft 6.4.12
2015-04-22 16:24:58 +02:00
asiekierka
9838582647
add new stamping crafting system with placeholder textures
2015-04-20 17:06:53 +02:00
asiekierka
8c77c24363
fix #2640 , #2641 , #2642 ; improve Zone Planner UI
2015-04-18 22:37:48 +02:00
asiekierka
d63d97a992
BuildCraft 7.0.1 Beta
2015-04-18 10:23:41 +02:00
asiekierka
ec15b0247a
move quarry to Builders module, clean up a few things
2015-04-16 15:08:33 +02:00
asiekierka
32aafdb01d
fix langfile
2015-04-15 15:45:10 +02:00
Hea3veN
b3ce32f26b
cleanup docking station and robot statements
2015-04-14 22:46:34 -03:00
asiekierka
a11a25456c
add 7.0.1 changelog, fix pump crash, fix pump entity spam, fix NPE in rare corner cases in RobotRegistry unloading
2015-04-13 17:26:22 +02:00
asiekierka
931bc0523f
Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x
2015-04-12 14:30:42 +02:00
asiekierka
c018abbb04
BuildCraft 6.4.11
2015-04-12 14:30:23 +02:00
asiekierka
605ef0fe28
fix up zone planner gui, add tablet improvements, merge, etc
2015-04-12 14:27:47 +02:00
asiekierka
ed5fd2b375
BuildCraft 6.4.10
2015-04-11 08:41:23 +02:00
asiekierka
b6ac3bb406
Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x
2015-04-10 21:04:27 +02:00
asiekierka
bce4720a2b
last-minute changelog update
2015-04-10 20:50:10 +02:00
asiekierka
b291458e4a
BuildCraft 6.4.9
2015-04-10 20:43:42 +02:00
asiekierka
27b385d1d0
Merge branch '6.5.x' of github.com:BuildCraft/BuildCraft into 6.5.x
2015-04-09 18:48:45 +02:00
asiekierka
5a2dc4db3c
add early tablet code, add facade non-laser recipe option, minor tweaks and refactors
2015-04-09 18:48:34 +02:00
Hea3veN
413cfc595d
add a new Load/Unload area for robots
2015-04-08 20:47:03 -03:00
asiekierka
5de8bb327b
Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x
...
Conflicts:
build.gradle
common/buildcraft/core/recipes/FlexibleRecipe.java
2015-04-06 21:21:49 +02:00
asiekierka
180a020fc7
BuildCraft 6.4.8
2015-04-06 21:20:38 +02:00
asiekierka
ad4d418f78
more zone plan changes
2015-04-05 10:39:42 +02:00
asiekierka
24441a1ae5
Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x
...
Conflicts:
build.gradle
common/buildcraft/transport/BlockGenericPipe.java
common/buildcraft/transport/pipes/PipeFluidsWood.java
2015-04-03 23:18:40 +02:00
asiekierka
eeaef4d9e0
BuildCraft 6.4.7
2015-04-03 22:03:51 +02:00
asiekierka
27beeb2542
forgot to push new robot API, push new zone planner GUI project
2015-04-03 13:34:25 +02:00
asiekierka
d6f5063c42
begin work on ingame config
2015-04-02 14:46:57 +02:00
asiekierka
4378884e78
Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x
2015-04-01 16:28:29 +02:00
asiekierka
16d6770c07
BuildCraft 6.4.6
2015-04-01 16:21:30 +02:00
asiekierka
71c45e60ae
add new Auto Workbench texture
2015-03-31 18:39:22 +02:00
asiekierka
fa447318a4
add round-robin sorting to diamond pipes, fix #2372 , fix minor lens bugs
2015-03-31 18:01:00 +02:00
asiekierka
493c261d9e
finish laser table renders
2015-03-26 22:40:59 +01:00
asiekierka
cef844212d
Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x
...
Conflicts:
build.gradle
2015-03-25 16:31:22 +01:00
asiekierka
5adaf78a02
BuildCraft 6.4.5
2015-03-25 15:42:26 +01:00
asiekierka
91194fc36d
update changelog, texture
2015-03-25 15:34:00 +01:00
asiekierka
ce01c5773e
allow placing machines on any side of a marker box
2015-03-24 17:29:27 +01:00
asiekierka
971f3614c9
Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x
2015-03-22 12:59:35 +01:00
asiekierka
04fe3c31a7
BuildCraft 6.4.4
2015-03-22 00:34:34 +01:00
asiekierka
0a20b53c6d
add RF power support to Auto Workbenches
2015-03-21 20:01:01 +01:00
asiekierka
bcb2a40fa5
make StatementParameterItemStacks override the description and output the item stack desc
2015-03-21 18:31:37 +01:00
asiekierka
ed76c9a4f1
Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x
...
Conflicts:
common/buildcraft/BuildCraftTransport.java
2015-03-21 18:12:37 +01:00
asiekierka
69e9173a12
changes to robot accept/request behaviour
2015-03-21 18:11:22 +01:00
asiekierka
2186fbdd48
new features to stripes pipes
2015-03-21 11:20:07 +01:00
asiekierka
5cb7c9fe00
add stripes pipe direction control, add stripes handler priority system to API, add IBlueprintItem API thing
2015-03-20 17:03:46 +01:00
asiekierka
36ec39a59e
improvements to Stripes Pipes
2015-03-20 15:07:12 +01:00
asiekierka
18add8b847
write global zone map system to replace earlier zone planner system
2015-03-19 22:01:52 +01:00
asiekierka
96492136c5
update
2015-03-17 08:24:14 +01:00
asiekierka
54088c2249
add assembly table, advanced crafting table and charging table models; improve pipe/gate speed further; add NEI support for gate recipes
2015-03-16 16:46:18 +01:00
asiekierka
470dfc0049
raise packet sending frequency, sync lang
2015-03-15 17:23:08 +01:00
asiekierka
082cda0653
update Essence, fix wrenches and non-rotatables, add glowing laser rendering, add paintbrushes
2015-03-14 17:03:20 +01:00
asiekierka
dd9c8fc84a
blueprint library is now electronic library, can store books; add LibraryAPI
2015-03-13 14:27:22 +01:00
asiekierka
360047ed45
project essence, part 2
2015-03-13 09:27:06 +01:00
asiekierka
e3f28b5826
project essence, part 1
2015-03-11 22:07:02 +01:00
asiekierka
41ea53ecb6
update versions.txt
2015-03-10 08:13:10 +01:00
asiekierka
5541c8e7fd
BuildCraft 6.4.3
2015-03-10 08:11:23 +01:00
asiekierka
07036941e5
made robot side light denote sleeping and energy level
2015-03-09 16:45:56 +01:00
asiekierka
4e6903547d
massive resources refactor, add robot reserved/linkes/in station triggers
2015-03-09 13:59:13 +01:00
asiekierka
fe76b79d4e
add debugger warning, improve pipe/robot debugging capabilities, fix lang
2015-03-07 13:26:23 +01:00
asiekierka
727c0e205b
Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft
2015-03-03 20:08:16 +01:00
asiekierka
883e8b479e
fix changelog
2015-03-03 20:07:43 +01:00
asiekierka
dfa3f5f557
BuildCraft 6.4.2
2015-03-03 20:06:19 +01:00
asiekierka
d6dce9ee44
Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft
2015-02-26 23:17:44 +01:00
asiekierka
9cd089bdc0
real BC 6.4.1, fix incorrect filler texture
2015-02-26 22:54:15 +01:00
asiekierka
9306baa0e8
BuildCraft 6.4.1
2015-02-26 22:49:15 +01:00
asiekierka
229f064e05
update license copyright year, fix #2470
2015-02-26 16:57:49 +01:00
asiekierka
bd2fa06063
add Programming Table
2015-02-24 14:39:23 +01:00
asiekierka
1f3a4ff2e6
BuildCraft 6.4.0 Beta
2015-02-22 22:35:22 +01:00
asiekierka
2389f1e67b
BuildCraft 6.3.7
2015-02-22 09:03:05 +01:00
Hea3veN
09b004e790
add a stripes robot
2015-02-19 21:10:11 -03:00
Hea3veN
6fe8ec37db
add a gate action to filter the tools of the robots
2015-02-17 18:10:26 -03:00
asiekierka
20313b1e7f
BuildCraft 6.3.6 - hotfix
2015-02-06 20:19:31 +01:00
asiekierka
86974d071e
fix changelog
2015-02-06 19:56:20 +01:00
asiekierka
0dd57e7f27
BuildCraft 6.3.5
2015-02-06 19:39:24 +01:00
Arona Jones
671d964f33
Fix #2426 and #2408 . Partially Fix #2345 .
2015-02-03 07:21:02 +00:00
asiekierka
5771b6b9e7
BuildCraft 6.3.4, fix #2423 and #2419
2015-01-31 00:42:54 +01:00
asiekierka
3fca102985
BuildCraft 6.3.3
2015-01-23 09:18:07 +01:00
asiekierka
f8ae10e2f2
BuildCraft 6.3.2
2015-01-22 23:37:52 +01:00
asiekierka
3be7ce1189
extend power number hiding to iron power pipes and creative engines
2015-01-18 11:06:18 +01:00
asiekierka
7eaf537ecf
the real BuildCraft 6.3.1 - make pluggables easier to remove, make pluggables pop directly into your inventory when removed
2015-01-10 18:42:55 +01:00
asiekierka
dd2e3ab3e9
BuildCraft 6.3.1
2015-01-10 17:31:33 +01:00
asiekierka
bfa726e928
BuildCraft 6.3.0
2015-01-06 15:20:28 +01:00
asiekierka
368eda1251
add quartz gates, scrollwheel support in gate and zone planner interfaces, add proper pipe wire bounds checking to wire parameters
2015-01-03 22:38:16 +01:00
asiekierka
8fba5bb6a1
change filter texture, fix lens recipe, add filter recipe, fix NPE in ColorUtils
2014-12-28 22:31:59 +01:00
asiekierka
90c551774e
add gate recipe cost multiplier, add missing filter localization name, temporaily disable power adapters
2014-12-24 15:08:17 +01:00
asiekierka
e69b876434
update resources
2014-12-21 21:22:05 +01:00
ganymedes01
b783cf6b5c
Gates and wires now glow in the dark when active
...
Note: Some texture re-work might be necessary... I think the current
lit texture are far too bright.
Found a bug: popping a gate out of the pipe doesn't update it on the
client side (a.k.a. the gate pops out but is still rendered on the pipe)
2014-12-19 16:19:23 -02:00
asiekierka
bbf178e48f
fix PipeEventBus, add filters, fix liquid QDS from HQM not connecting (apparently not everything has FluidTankInfo)
2014-12-18 23:37:33 +01:00
asiekierka
bdc920bef8
add lens rendering
2014-12-17 16:36:03 +01:00
asiekierka
e4c79f44af
add lenses (no renderer yet), optimize some packets
2014-12-17 16:19:03 +01:00
asiekierka
bd52ca6981
Merge branch '6.2.x' of github.com:BuildCraft/BuildCraft into 6.3.x
2014-12-15 17:32:24 +01:00
asiekierka
ddf4c717df
fix versions.txt
2014-12-14 23:00:09 +01:00
asiekierka
87fffc2456
BuildCraft 6.2.5
2014-12-14 17:03:02 +01:00
ganymedes01
a6e9c4865d
Made robot lights shiny
2014-12-14 16:30:32 +01:00
asiekierka
da923944de
sync
2014-12-13 14:12:13 +01:00
asiekierka
883de2d8bb
fix #2298 , add list tooltips, fix inserting lists inside lists, fix list stackability
2014-12-13 10:20:44 +01:00
asiekierka
01ad2501c9
BC 6.2.4, fix #2290
2014-12-10 23:41:55 +01:00
ganymedes01
4f61b5998a
Made robot lights shiny
2014-12-10 18:29:58 -02:00
asiekierka
2538c3457c
BuildCraft 6.2.3
2014-12-10 20:50:38 +01:00
asiekierka
63b1703e4e
BuildCraft 6.2.2
2014-12-01 22:10:37 +01:00
asiekierka
a7f087f598
remove BlockMultiTexture
2014-11-30 10:42:54 +01:00
asiekierka
5dcbf56c16
BuildCraft 6.2.1
2014-11-30 00:32:28 +01:00
asiekierka
b76846e971
unnerf Mining Wells, add shift-hover pipe tooltips, etc.
2014-11-28 18:35:25 +01:00
asiekierka
9bf2a15ca5
BuildCraft 6.2.0
2014-11-27 20:25:34 +01:00
asiekierka
2dec0b2475
remove old pre-1.5 textures
2014-11-23 15:09:12 +01:00
asiekierka
9f36946910
optimize all PNGs with optipng
2014-11-23 15:06:05 +01:00
asiekierka
3437d57818
add resources for overheat gate, move redstone actions to their respective classes (for #1891 )
2014-11-23 15:00:22 +01:00
asiekierka
60ec37ee38
remove science book textures
2014-11-16 13:57:38 +01:00
asiekierka
b299537a13
emerald fluid pipes can now filter the liquid
2014-11-16 13:56:26 +01:00
Adrian Siekierka
82391bf728
add diamond liquid pipes
2014-11-13 18:07:03 +01:00
Adrian Siekierka
70396e7e24
begin work on Diamond Liquid Pipes
2014-11-13 14:39:37 +01:00
Adrian Siekierka
58ee6f2df4
Clay Insertion Pipes, add translations for clay transport/sandstone power pipes
2014-11-12 17:07:35 +01:00
Adrian Siekierka
051036848a
Merge remote-tracking branch 'origin' into 6.2.x
2014-11-10 21:04:59 +01:00
Adrian Siekierka
b93b1d0d1a
BuildCraft 6.1.8
2014-11-10 21:04:50 +01:00
Adrian Siekierka
dc59ce156f
Merge remote-tracking branch 'origin' into 6.2.x
2014-11-09 16:04:34 +01:00
Adrian Siekierka
f180038bfd
add/fix translations
2014-11-09 16:04:09 +01:00
Adrian Siekierka
b78bf28ead
fix GUI offsets and textures, finish charging table
2014-11-08 10:31:47 +01:00
Adrian Siekierka
0fc902c3b7
update changelog
2014-11-07 19:17:27 +01:00
asiekierka
ffb659bc7c
update changelog, version info
2014-11-02 08:24:53 +01:00
asiekierka
6813d9882f
touch-ups: fix lang typo, fix tooltip delay in zone planner
2014-11-02 08:12:22 +01:00
asiekierka
f17f0cc9d7
touchups: requester/zone planner recipes, tooltip/GUI improvements, adding missing langnames
2014-11-02 08:06:36 +01:00
asiekierka
ad25b17c6e
builders now only send packets to GUI watchers
2014-11-02 07:36:33 +01:00
asiekierka
f190377014
add gatesideonly icon, make Redstone Output use localizations, update en_US.lang
2014-10-26 17:58:59 +01:00
asiekierka
0fe11813e8
make gate copiers use raytracing and not naive sides, add textures and recipes
2014-10-26 08:57:49 +01:00
asiekierka
fd370955bd
add gate verification post-copy, fix minor update bug
2014-10-26 07:32:12 +01:00
asiekierka
fe64c3e39b
clean up resources, add missing emerald gate tooltip
2014-10-24 16:06:20 +02:00
asiekierka
e5dccdc229
recompress all textures with pngout, move texture masters to misc
2014-10-18 10:17:57 +02:00
asiekierka
c3a12170c7
update localization - fix misspelling and add boards tab
2014-10-15 18:24:10 +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
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
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
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
asiekierka
13dcc7841d
Forgot to push fixed lang file
2014-09-04 20:06:47 +02:00
asiekierka
3f81bb3262
Emerald Kinesis Pipe
2014-09-04 13:07:37 +02:00
SpaceToad
1c23818474
prepare version 6.0.18
2014-09-02 21:22:58 +02:00
