Commit graph

400 commits

Author SHA1 Message Date
SpaceToad
48d95b1e26 made progress with research book, for #1951 2014-07-27 23:05:35 +02:00
SpaceToad
d10c570466 start work on science book 2014-07-25 08:40:47 +02:00
SpaceToad
1e04358334 Generalized packet slicing.
Added texture for zone planner.
2014-07-21 17:45:59 +02: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
bb72ff14ec Merge branch '6.0.x' into 6.1.x
Conflicts:
	common/buildcraft/BuildCraftCore.java
2014-07-12 00:33:53 +02:00
SpaceToad
6ac6ea4734 prepare release 6.0.17 for Minecraft 1.7.10 2014-07-11 23:57:44 +02:00
SpaceToad
23d46e2bce made progress with builder robot, for #1908 2014-07-07 00:19:01 +02:00
SpaceToad
4c731c533c started work on builder robot, for #1908 2014-07-06 16:59:37 +02:00
SpaceToad
1153dd3c9f started library of default blueprints 2014-07-06 16:52:37 +02:00
SpaceToad
2bb67431b8 added new triggers for energy request and storage detection, close #1897 2014-07-04 19:34:40 +02:00
SpaceToad
66ae784ed0 bucher -> butcher, close #1926 2014-07-04 09:03:24 +02:00
SpaceToad
4c86502701 started implementation of shovelman and bucher, #1924 and #1925 2014-07-01 00:33:00 +02:00
SpaceToad
43e1e6d8c0 implemented filter for block breaking robots, for #1922 2014-06-30 09:14:30 +02:00
SpaceToad
7721d0d95d added farmer and harvester robots, part of #1922 2014-06-30 00:07:48 +02:00
SpaceToad
d38ab37cc0 added missing captions 2014-06-28 18:14:31 +02:00
SpaceToad
bb3618aaf9 Further work in robot carrier control.
Items can now be filtered.
It's now possible to put items in a pipe.
For #1877.
2014-06-28 17:15:34 +02:00
SpaceToad
f61c3cacaa added station robot forbid, for #1877 2014-06-28 00:31:00 +02:00
SpaceToad
9f1187c3aa implemented robot sleep / wakeup, for #1873 and #1877 2014-06-27 23:42:30 +02:00
SpaceToad
e4e477a241 implement miner robot, close #1915 2014-06-26 23:07:51 +02:00
SpaceToad
3c409ca0b9 started work on bomber, for #1913 2014-06-26 08:51:28 +02:00
SpaceToad
3d9a2ee9de first version of knight robot, close #1911 2014-06-26 00:20:57 +02:00
SpaceToad
dfc759de6c Started work on carrier robot, for #1907. 2014-06-24 07:32:50 +02:00
SpaceToad
4428b44674 Started work on actions to provide / request items, for #1877. 2014-06-22 17:09:25 +02:00
SpaceToad
c3f5e44565 implemented close pipe action, close #1902 2014-06-22 15:03:16 +02:00
SpaceToad
ac28a810aa fixed triggers and actions transparency 2014-06-15 19:46:33 +02:00
SpaceToad
254a533060 Allows to mark areas and path on top of specific locations.
Generalization of #1882
2014-06-15 03:28:35 +02:00
SpaceToad
44d4e4e3b9 started work on docking action, #1877 2014-06-15 02:41:00 +02:00
SpaceToad
31cc8b6438 removed unused texture 2014-06-15 00:17:54 +02:00
SpaceToad
2aa1530444 prepare icons for robot triggers / actions, #1877 2014-06-15 00:16:58 +02:00
SpaceToad
0ca64b0798 implemented a location recording, close #1882 2014-06-14 17:55:53 +02:00
SpaceToad
70c1cd0535 Started a major refactor of the trigger action system.
Triggers and actions are moving towards more factorization in statements.
Actions will now accept parameters.
Triggers and actions will accept up to 3 parameters.
Parameters will not only be stacks, in particular for pipe wire.
This is supporting in particular the emerald gate implementation, for #1880.
2014-06-13 13:15:33 +02:00
SpaceToad
101f591f8f Implemented leave cutter, close #1876 2014-06-12 18:29:02 +02:00
SpaceToad
6389baa9cb Implemented planter robot, close #1874. 2014-06-12 13:46:52 +02:00
SpaceToad
00521143b6 Merge branch '6.0.x' into 6.1.x 2014-06-07 18:57:09 +02:00
SpaceToad
92bfbe4e27 added missing lang properties 2014-06-07 18:56:38 +02:00
SpaceToad
1a74389a5c added additional random parameters for robot, #1732 2014-06-07 11:25:32 +02:00
Prototik
6eec57c35f Fix transparent facade item texture 2014-06-03 10:50:20 +08:00
Prototik
091ae87333 Make Builder support fluids via containers/pipes 2014-06-02 23:33:03 +08:00
SpaceToad
02e8ef057e removed unused files and graphic components 2014-06-01 15:16:39 +02:00
SpaceToad
e193d634cf made progress in board parameters, #1732 2014-06-01 15:13:23 +02:00
SpaceToad
7898637b33 prepare version 6.0.16 2014-05-31 18:16:42 +02:00
SpaceToad
e99f0a3c4b made progress with boards and parameters, #1732 2014-05-30 09:04:00 +02:00
SpaceToad
3f925ae0e9 completed a first robot+board, #1732 2014-05-29 21:58:08 +02:00
SpaceToad
7acb8b4592 made progress with robot recipes and boards, #1732 2014-05-27 00:25:39 +02:00
SpaceToad
379ea6e278 fixed style and removed unused files 2014-05-26 23:00:01 +02:00
SpaceToad
5046cc445b added missing icons, #1732 2014-05-26 09:35:10 +02:00
SpaceToad
34d285a448 started work on redstone boards, #1732 2014-05-26 09:34:28 +02:00
SpaceToad
e9b84c7121 made progress for implementation of testing framework, #1846 2014-05-24 21:05:23 +02:00
SpaceToad
c23a5573f4 Merge branch '6.1.x' into 6.1.x-pathfinding 2014-05-24 13:37:44 +02:00
SpaceToad
8039dacff8 started to work on tester item 2014-05-24 13:35:22 +02:00
SpaceToad
625b21719d Merge branch '6.0.x' into 6.1.x 2014-05-18 21:39:02 +02:00
SpaceToad
6c4dbb4297 prepare hotfix 6.0.15 2014-05-18 21:29:59 +02:00
SpaceToad
77708e8bff Merge branch 'transparent-facades' of https://github.com/Prototik/BuildCraft into Prototik-transparent-facades 2014-05-18 17:04:52 +02:00
SpaceToad
13c8562fa1 Merge branch '6.0.x' into 6.1.x 2014-05-18 16:57:07 +02:00
SpaceToad
b63fb22db4 prepare 6.0.14 release 2014-05-18 16:00:46 +02:00
Prototik
3cfa2c5e14 Support for transparent facades 2014-05-18 16:38:52 +08:00
Prototik
6db270d407 Really advanced phased facades 2014-05-17 22:30:09 +08:00
dmillerw
8b92fcfa88 Added localization for phased facade 2014-05-15 19:37:20 -07:00
SpaceToad
2fddee9389 prepare 6.0.13 release 2014-05-13 21:26:19 +02:00
SpaceToad
9dec031449 fixed spelling mistake 2014-05-11 19:53:18 +02:00
SpaceToad
af402df7f9 prepare 6.0.12 release 2014-05-11 18:47:48 +02:00
SpaceToad
1fc3890b96 prepare 6.0.11 release 2014-05-10 23:51:41 +02:00
SpaceToad
49747b054e Minimal texture change, derived from #1773, close #1207. 2014-05-10 17:08:17 +02:00
SpaceToad
492b2805bf prepare 6.0.10 release 2014-05-06 23:34:58 +02:00
SpaceToad
3e4378f565 added back old architecture textures, close #1718 2014-05-06 17:42:58 +02:00
Prototik
93806cecca Localize update messages 2014-05-06 20:02:41 +08:00
SpaceToad
7cdddf3361 Improved blueprint unique id recognition in file names.
Increased length of blueprint names and use standard text UI in the architect.
Close #1713
2014-05-06 11:14:35 +02:00
SpaceToad
21fd683e58 Re-activated version check and changelog extracting, now based on github files.
Close #1709
2014-05-05 23:54:23 +02:00
SpaceToad
fe5e734b64 Added provision for blueprints with non existing blocks and entities.
Close #1702
2014-05-05 17:01:48 +02:00
Prototik
aa68c3cd81 Add MjAPILegacy for providing an old-style api for the new power api.
Add Energy Converter block for the same things in game.
2014-05-05 16:21:25 +08:00
SpaceToad
c2341c4aaa Merge branch '5.0.x' into 6.0.x 2014-05-04 12:21:27 +02:00
SandGrainOne
ad7587785d Corrected wire tooltip in gates 2014-05-04 02:33:28 +02:00
SpaceToad
5bde6b9dfc localize architect strings, close #1682 2014-05-03 22:30:16 +02:00
SpaceToad
f4a6d621e3 added facade tab back 2014-05-03 09:51:44 +02:00
Prototik
cb69f11cf9 Split creative tabs by blocks, items and pipes 2014-05-03 10:25:14 +08:00
SpaceToad
920be38a5f added building permissions, close #1509 2014-05-01 13:14:57 +02:00
dmillerw
ecfb6e8ca4 Added phased facades 2014-04-27 16:07:46 -07:00
SpaceToad
5812d4f0bf Merge branch 'BuildCraft-5.1.x' into NextGen
Conflicts:
	buildcraft_resources/assets/buildcraft/lang/en_US.lang
	common/buildcraft/energy/BlockEngine.java
	common/buildcraft/factory/BlockTank.java
	common/buildcraft/transport/pipes/PipeItemsEmerald.java
2014-04-26 13:39:01 +02:00
SpaceToad
3fc344c9b9 Merge branch 'BuildCraft-5.0.x' into BuildCraft-5.1.x 2014-04-26 13:12:48 +02:00
TXX59
1ab8cd96f9 Change back to Stirling Engine as requested by ST. 2014-04-16 21:07:44 +01:00
TXX59
11cdba5686 Remove deprecated/redundant code in main classes
I've done a bit of cleanup in the BuildCraft code by removing any
redundant/unnessecary little things and removing all deprecated
LanguageRegistry methods from main mod classes.
2014-04-14 17:27:59 +01:00
SpaceToad
d0994d6f6e Merge pull request #1607 from TXX59/NextGen
NextGen Achievements
2014-04-14 17:09:10 +02:00
SandGrainOne
080b4ba749 Cylinder pattern was missing the name 2014-04-14 09:42:27 +02:00
SandGrainOne
7d309d3399 Black list option for Emerald item pipe
Swapped out the multi state button with a button row.
Added a new button type with interfaces.
2014-04-13 22:08:33 +02:00
TXX59
1eb4299fa9 Add language fields for new achievements 2014-04-13 17:07:10 +01:00
SpaceToad
b58653c90b Merge branch 'engine' of https://github.com/dmillerw/BuildCraft into dmillerw-engine 2014-04-13 18:03:42 +02:00
dmillerw
daa828259d Engine rendering changes, as requested by @CyanideX 2014-04-12 21:13:42 -07:00
dmillerw
3fe4e3bfed Addition of creative engine 2014-04-12 18:31:37 -07:00
dmillerw
8267cb87ee Start of the new block renderer 2014-04-11 19:27:38 -07:00
Vexatos
27b594342b Some fixes to en_US.lang 2014-04-09 12:19:02 +02:00
SpaceToad
757bea50dc improved block destroy animation, and implemented filler pattern 2014-04-05 16:10:39 +02:00
SpaceToad
307aeb2dfb start work on blueprint confirguration, for #1541 2014-03-29 16:32:38 +01:00
SpaceToad
2d3d70f6db Merge branch 'BuildCraft-5.1.x' into NextGen 2014-03-19 11:36:15 +01:00
SandGrainOne
8765dac0e3 Gates indicate that trigger require parameter
Also removing normal Inventory Triggers from FilteredBuffer, for now.
2014-03-18 23:00:04 +01:00
SpaceToad
9827966140 merged with BuildCraft-5.1.x 2014-03-15 23:57:59 +01:00
AEnterprise
c40d3ce02c Finished the achievements
-Moved all achievements to the craftinghandler
-Added "Refine and redefine"
-Added "Tingly Laser"
2014-03-15 22:03:49 +01:00
SpaceToad
5e209f24d4 added missing name string for cylinder 2014-03-15 12:54:21 +01:00
AEnterprise
82de1ed0ed Make the previous achievements avalable
It didn't work to detect the crafting of the blocks so i changed it so that you get the achievement when you place the block in the world
2014-03-12 17:16:02 +01:00
AEnterprise
36cf4cbdde Added more achievements
-Added "Just hit it!"
-Added "A lot of crafting"
-Added "Straight down"
-Added "Chunk destroyeré
-Added "Faster filling"
-Added "Time for some logic"
2014-03-12 15:58:00 +01:00
AEnterprise
19d6bff276 Added first buildcraft achievements and achievement page :-)
-Added a craftingHandler
-Added "A bit rough around the edges"
-Added "Hard as a rock"
-Added "Is it stainless?"
-Added "No, it isn't made of honey"
-Added "Shiny!"
2014-03-12 14:10:46 +01:00
SpaceToad
b615089a9b Merge branch 'BuildCraft-5.0.x' into NextGen
Conflicts:
	build.gradle
2014-03-09 14:54:36 +01:00
SoniEx2
4d21f5c991 Update mcmod.info
Fix author list
2014-03-08 10:58:47 -03:00
SpaceToad
824396f989 added support for blueprints with no name, fix #1476 2014-03-06 08:55:47 +01:00
SpaceToad
4ab0eaf290 last set of fixes for blueprints authoring 2014-02-23 17:36:47 +01:00
SpaceToad
d8c4d5db14 first implementation of save / load of blueprint on the disk 2014-02-23 15:33:28 +01:00
SpaceToad
2f1eb04d5d merged with builder 2014-02-18 21:22:58 +01:00
AbrarSyed
507eb014af Step 2: The Rebirth 2014-02-17 01:24:19 -06:00
AbrarSyed
22b0baed33 Step 1: The Purge 2014-02-16 14:08:51 -06:00
SpaceToad
4948e02cb5 initial categorization of items 2014-02-16 17:21:22 +01:00
SpaceToad
1677fa3785 merged with latest changes and fix compilation errors 2014-02-16 12:14:30 +01:00
SpaceToad
90f2532278 migrated to Minecraft 1.7 2014-02-16 12:10:01 +01:00
SpaceToad
a20f40b67f removed file added by mistake 2014-02-16 08:58:51 +01:00
robin4002
754857dbb6 Move to assets lang system 2014-02-16 00:48:23 +01:00
SpaceToad
ec265fd6f3 implemented robot stations and robot hierarchy 2014-02-08 10:28:16 +01:00
SpaceToad
12cb51373e various experiments for BC NextGen 2014-02-01 17:19:07 +01:00
SandGrainOne
5055d8c146 Fluid level trigger for tanks 2014-01-30 20:08:01 +01:00
SpaceToad
3dd418a27a progress in tool filler 2014-01-20 21:15:30 +01:00
SpaceToad
48ec6c9da7 further progress in urbanist implementation 2014-01-18 14:53:09 +01:00
ArkeousAero
09e32da2c7 Added cylinder pattern for the filler. 2014-01-08 04:07:18 -06:00
SpaceToad
78f62ffffb Merge branch 'nightly' into marmot 2014-01-06 20:24:58 +01:00
CovertJaguar
1a1d2707fc Version 4.2.2 2014-01-04 11:49:47 -08:00
SpaceToad
197c5b7edf Implemented icons for pulsar and single pulsar, close #1391 2014-01-04 15:43:44 +01:00
CovertJaguar
3b0a047570 Finalize Gate Rework
-Added Integration Table Recipes
-Finished and tested Integration Table
-Re-added all Gate recipes
-Clean up Pipe Wires, Chipsets, etc...

Changes:
-Gate Logic Swap recipes moved from Workbench to Integration Table.
-Pipe Wires condensed into a single Item
-Pipe Wires are now distributed evenly between the gates: Red with the
Basic Gate, Blue with Iron, Yellow with Gold, and Green with Diamond.
Recipes adjusted to match.

As of this commit, Gates should be both craftable and usable again. The
Integration Table is also ready to be used. Gate Expansions are
completely implemented and usable.

Enjoy!
2014-01-02 04:58:08 -08:00
CovertJaguar
0c057f28d1 Flesh out remaining Integration Table details
No recipes defined yet, so no idea if it actually works.
2013-12-29 03:05:21 -08:00
CovertJaguar
5150d01672 Add Redstone Fader Exp + major cleanup 2013-12-27 08:40:44 -08:00
CovertJaguar
4e3f4c1e94 Rewrite Timer Trigger so it actually works...
...and add Clock Timer Gate Expansion.
2013-12-24 00:22:17 -08:00
CovertJaguar
1cb20ea59d Kill Gate Icon Provider, and cleanup unused icons 2013-12-21 19:49:20 -08:00
MomoNasty
c730d2f41f fix the logo not showing up in the modlist 2013-12-20 06:11:34 -05:00
CovertJaguar
986f407af6 Merge nightly into marmot 2013-12-19 05:35:40 -08:00
CovertJaguar
70822c0178 Add additional support for Gate Expansions
Things left to do:
-Sync expansions on the pipe to the client
-Rewrite Assembly table to support modifying Item NBT so you can add
expansions to Gates
2013-12-10 02:02:35 -08:00
CovertJaguar
7ee74d56a1 First Iteration of Gate Rewrite
GateKind enum is gone, replaced with two enums: GateMaterial and
GateLogic.

Pulsars and Timers are abstracted into GateExpansions that can be
applied to "upgrade" a gate. (Incomplete)

GateExpansions will eventually be moved to the API so that other can
define new expansions easily.

GateExpansions are not currently serialized or synced to the client.
This remains to be done.

Legacy migration support is included, but untested.

Currently only the base logic texture layer (white/black) are being
rendered. Eventually the material and expansions will each render an
additional texture layer onto the gate.
2013-12-05 13:38:00 -08:00
CovertJaguar
03acd96b2b Version 4.2.1 2013-12-03 15:47:57 -08:00
CovertJaguar
4b80435f3d Merge Timer into Marmot 2013-12-01 22:27:42 -08:00
CovertJaguar
0cbc63e919 Version 4.2.0 2013-11-29 17:08:49 -08:00
CovertJaguar
6d79989435 Changelog for 4.2.0 2013-11-29 12:11:38 -08:00
Yopu
25ee549253 Added quartz gates and chipsets.
Quartz gates act like gold gates with 2 exceptions:
They can connect to all pipe wire types.
There are 3 additional gate triggers that function as timers.

The timers have a short, medium, and long mode which can be set via config.
2013-11-25 20:29:36 -05:00
CovertJaguar
81b45b692e Fix Emzuli tooltip 2013-11-24 07:24:08 -08:00
CovertJaguar
cc8c707c46 Rename Lapis Pipe to Lazuli Pipe 2013-11-24 07:21:48 -08:00
CovertJaguar
6f57b4a80d Logemerald->Emzuli Rework + PipeEvents
Modified Logemerald:
-Added ability to paint items as they are extracted
-Renamed to Emzuli, texture and recipe changed accordingly

PipeEvents:
-Added PipeEvents a replacement for Hook interfaces, precursor to 1.7
Pipe API
-Implement methods with signature "eventHandler(PipeEventClass event)"
to receive events

Widgets:
-General improvements for use as a button
2013-11-24 06:23:37 -08:00
CovertJaguar
5d5d5a2706 Merge branch 'SandGrainOne-master' 2013-11-23 12:25:57 -08:00
CovertJaguar
25d411ce1a Merge Filler into Master 2013-11-23 12:25:15 -08:00
SandGrainOne
ec4ed4df99 Adding Logemerald pipe
This is an action sensitive extraction pipe. The pipe can be configured
with 4 different items and actions will decide which one to extract from
the connected inventory.
2013-11-21 20:57:18 +01:00
CovertJaguar
7ee48c9cbd Fix Fluid Localization 2013-11-20 20:32:11 -08:00
CovertJaguar
0f5a47f31f Fairly Major Filler Rework
Changes:
-The "crafting grid" is gone.
-API completely reworked
-Patterns can be "stateful", this could bring major improvements to the
scanning algorithms if utilized
-You can change the pattern via Gate Actions
-Various peripherally related GUI framework changes
2013-11-19 03:54:37 -08:00
CovertJaguar
7f73cc2691 Clean up Gate GUIs a bit
Size them appropriately and align the slots properly.
2013-10-29 03:08:22 -07:00
CovertJaguar
1e0e30d62a Version 4.1.2 2013-10-27 08:26:17 -07:00
CovertJaguar
c4d60c9230 Add tab localization
Closes #1298
2013-10-25 18:14:58 -07:00
CovertJaguar
9b9f468dd5 Fixed typo 2013-10-23 22:15:20 -07:00
CovertJaguar
f593cf7a20 Version 4.1.1 2013-10-23 21:57:26 -07:00