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
..
GoalIcon.ocd	Update more goal icons for better editor size	2016-08-04 21:15:25 -04:00
Material.ocg	Added new material textures by Nachtfalter and Matthi.	2015-10-05 02:02:36 +02:00
System.ocg	fix failure sequence for Chine.ocs	2015-02-16 20:29:45 +01:00
DescDE.txt	worlds descriptions: fix whitespace and typos	2015-12-29 23:14:01 +01:00
DescUS.txt	worlds descriptions: fix whitespace and typos	2015-12-29 23:14:01 +01:00
Map.c	Added new material textures by Nachtfalter and Matthi.	2015-10-05 02:02:36 +02:00
ParameterDefs.txt	achievements for worlds inside .ocf	2014-10-03 18:48:25 +02:00
Scenario.txt	new world: rapid refining	2016-08-07 14:24:28 +02:00
Script.c	Chine: Unstuck starting clonks if necessary (#1786).	2016-07-25 17:50:38 +02:00
StringTblDE.txt	achievements for worlds inside .ocf	2014-10-03 18:48:25 +02:00
StringTblUS.txt	achievements for worlds inside .ocf	2014-10-03 18:48:25 +02:00
Title.jpg	title images for the worlds	2014-10-04 13:12:29 +02:00
Title.txt	added new World: Chine.ocs	2014-09-21 18:37:48 +02:00