Commit graph

222 commits

Author SHA1 Message Date
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