Merge branch 'master' into UnpickableComponent

# Conflicts: # resources/Schema/Components.xsd # resources/Schema/Types/Entity.xsd
2016-03-13 22:00:10 +01:00
parent b3ea26779a d9b47ddb62
commit 53dd96d44d
186 changed files with 28974 additions and 20087 deletions
@@ -72,6 +72,8 @@
 							<xs:element ref="c:ServerIdentity" minOccurs="0"/>
 							<xs:element ref="c:ServerList" minOccurs="0"/>
 							<xs:element ref="c:Unpickable" minOccurs="0"/>
+							<xs:element ref="c:ConfigBtnResolution" minOccurs="0"/>
+							<xs:element ref="c:ConfigBtnFloat" minOccurs="0"/>
 						</xs:all>
 					</xs:complexType>
 				</xs:element>