Parker
37adec2afe
Updated logging to log4j2
2014-08-02 11:33:58 -04:00
ninehous
ecc4cc0459
Fixes #1956
...
I did some thinking and realized that the intended behavior would probably be allowing the placement of a blank blueprint without anything happening. That is the same behavior of the builder has I think it should be the same.
2014-07-31 19:31:38 +03:00
SpaceToad
23e841f323
started integration of robots in research tree, for #1951
2014-07-29 08:54:00 +02:00
SpaceToad
4a1bc66d63
made progress with addition to research tree, for #1951
2014-07-28 23:51:50 +02:00
SpaceToad
149700c721
Merge branch '6.1.x-research' into 6.1.x
2014-07-27 23:06:13 +02:00
SpaceToad
48d95b1e26
made progress with research book, for #1951
2014-07-27 23:05:35 +02:00
AEnterprise
854b733e92
more accurate aiming of the lasers
2014-07-27 14:07:18 +02:00
SpaceToad
8006427a0b
Merge pull request #1937 from Itaros/facadesexposure
...
Redesigned texture state system
2014-07-25 08:45:36 +02:00
SpaceToad
d10c570466
start work on science book
2014-07-25 08:40:47 +02:00
Semion Nadezhdin
5330f9860c
Removed On-Demand Holder
2014-07-24 15:10:37 +04:00
Semion Nadezhdin
ab352e4014
Comments and licensing fixes
2014-07-24 13:31:15 +04:00
SpaceToad
01273bd63c
Fixed style.
2014-07-22 19:52:10 +02:00
SpaceToad
7f5d086696
hide buttons and items when doing fullscreen map
2014-07-21 18:04:38 +02:00
SpaceToad
1e04358334
Generalized packet slicing.
...
Added texture for zone planner.
2014-07-21 17:45:59 +02:00
Semion Nadezhdin
9c084eadc5
Removed abandoned mask and provided default texture
2014-07-21 19:25:29 +04:00
SpaceToad
e155b9b761
robots can now work on a zone defined from a map
2014-07-21 14:34:21 +02:00
SpaceToad
b117a23c5d
added multi-area selection capabilities
2014-07-20 23:41:43 +02:00
SpaceToad
c960176f57
implemented smart loading of image from center to borders
2014-07-20 12:28:49 +02:00
SpaceToad
04bce9dc5c
initial experiments with map planning block
2014-07-19 21:27:50 +02:00
Semion Nadezhdin
17f312b56e
Made FakeBlock generalized singleton
2014-07-15 20:00:30 +04:00
SpaceToad
bc60546eb9
added energy management for builder robot, close #1908
2014-07-15 15:55:32 +02:00
SpaceToad
0b710d998a
made progress in builder robot, for #1908
2014-07-15 12:49:55 +02:00
Semion Nadezhdin
78b3c7dfc0
fixup! Redesigned texture states system
2014-07-12 05:30:40 +04:00
Semion Nadezhdin
725644b5fc
Redesigned texture states system
2014-07-12 05:11:18 +04:00
SpaceToad
bb72ff14ec
Merge branch '6.0.x' into 6.1.x
...
Conflicts:
common/buildcraft/BuildCraftCore.java
2014-07-12 00:33:53 +02:00
SpaceToad
068bb6f5fa
Merge branch '5.0.x' into 6.0.x
...
Conflicts:
common/buildcraft/BuildCraftCore.java
2014-07-12 00:30:31 +02:00
SpaceToad
91a6d08e3c
fixed version requirements
2014-07-12 00:24:45 +02:00
SpaceToad
e515924e46
Merge branch '6.0.x' into 6.1.x
2014-07-11 22:48:09 +02:00
SpaceToad
9d4465bbc5
Merge branch '6.0.x' into 6.1.x
2014-07-11 22:26:44 +02:00
SpaceToad
ab4114dbe6
Merge branch '5.0.x' into 6.0.x
...
Conflicts:
common/buildcraft/BuildCraftEnergy.java
2014-07-11 22:26:29 +02:00
Andrew Dudney
f9e9c6cb26
Changed build.gradle to use RunDir, changed deprecated fluid localized name functionality, changed deprecated biome type desert to sandy.
2014-07-11 14:12:02 -06:00
Andrew Dudney
c55db01daf
Removed deprecated functionality and moved to equivalent.
2014-07-11 10:50:37 -06:00
Andrew Dudney
23e8abe00a
Changed from assetDir to runDir, removed excess glPushAttrib
2014-07-11 10:43:58 -06:00
SpaceToad
4c6e7bb39e
Merge branch '6.0.x' into 6.1.x
...
Conflicts:
api/buildcraft/api/power/PowerHandler.java
build.gradle
common/buildcraft/core/robots/EntityRobotPicker.java
common/buildcraft/factory/TileRefinery.java
common/buildcraft/transport/TileGenericPipe.java
2014-07-11 09:00:08 +02:00
SpaceToad
3e401acfbe
Merge branch '6.0.x-1.7.10' of https://github.com/adudney/BuildCraft into 6.0.x
...
Conflicts:
build.gradle
2014-07-11 08:53:39 +02:00
SpaceToad
1791c485af
Merge branch '5.0.x' into 6.0.x
...
Conflicts:
build.gradle
common/buildcraft/transport/BlockGenericPipe.java
common/buildcraft/transport/render/PipeItemRenderer.java
2014-07-11 08:49:38 +02:00
SpaceToad
4144188467
fixed rendering problems, merged from 6.0.x, close #1934
2014-07-11 08:43:49 +02:00
SpaceToad
5ab655a226
Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x
2014-07-10 07:57:05 +02:00
SpaceToad
b462bc6dd7
fixed robot size, deactivate robot collisions
2014-07-10 07:56:52 +02:00
SpaceToad
a668977ff5
Merge pull request #1932 from simon816/pipe-item-color
...
Add support for giving items a color when calling injectItem
2014-07-10 07:23:06 +02:00
SpaceToad
87c7c9043f
added render code for builder robots, for #1908
2014-07-10 07:15:40 +02:00
SpaceToad
addad59d08
made progress with robot builder, for #1908
2014-07-09 09:00:36 +02:00
simon816
7a941c1279
Add support for injecting colored items in pipes
2014-07-08 22:38:24 +01:00
SpaceToad
b71fe3cce8
made progress for builder robot, for #1920
2014-07-08 22:40:39 +02:00
SpaceToad
23d46e2bce
made progress with builder robot, for #1908
2014-07-07 00:19:01 +02:00
SpaceToad
3ccb215cf9
fixed error in previous change
2014-07-06 23:06:56 +02:00
SpaceToad
4c731c533c
started work on builder robot, for #1908
2014-07-06 16:59:37 +02:00
SpaceToad
fcab170b0b
fixed style
2014-07-06 14:46:40 +02:00
SpaceToad
40c882de25
Various fixes in robot behavior.
2014-07-06 13:22:58 +02:00
SpaceToad
6de8ad01ea
improved behavior of farmer robot
2014-07-06 00:21:37 +02:00
