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
..
DefCore.txt	Add HideInCreator=true to internal/helper/library definitions	2016-07-10 22:06:48 -04:00
Script.c	pump only activates when drain is free or accepts liquid	2016-08-07 21:26:23 +02:00