Sven Eberhardt bce903ee04 Merge branch 'master' into qteditor ... Conflicts: planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/Script.c planet/Objects.ocd/Libraries.ocd/Animal.ocd/CreatureControl.ocd/DefCore.txt		2016-08-13 23:42:59 -04:00
..
PipeLine.ocd	Merge branch 'master' into qteditor	2016-08-06 21:45:19 -04:00
DefCore.txt	adapt objects and scenarios to new component implementation	2016-05-21 13:34:34 +02:00
Graphics.8.png	changed Pipe graphics to AlteredARMOR's pipe render	2012-05-13 11:13:55 -07:00
GraphicsDrain.png	Different graphics for drain and source pipe (#1230).	2015-10-06 01:34:28 +02:00
GraphicsSource.png	Different graphics for drain and source pipe (#1230).	2015-10-06 01:34:28 +02:00
Script.c	pump only activates when drain is free or accepts liquid	2016-08-07 21:26:23 +02:00
StringTblDE.txt	Refactoring: Completely remodeled pipe interface	2016-02-16 21:03:20 +01:00
StringTblUS.txt	Refactoring: Completely remodeled pipe interface	2016-02-16 21:03:20 +01:00