From 7bb155ac9e34004ba9453808c19f24ebf22ed521 Mon Sep 17 00:00:00 2001
From: Mrchiantos <51173452+Mrchiantos@users.noreply.github.com>
Date: Mon, 22 Jul 2019 00:17:14 +0200
Subject: [PATCH] Revert "modify"

This reverts commit 8863f80860723eab7d1a046542ad15bacc114ce0.
---
 CMakeLists.txt         | 7 +++----
 build/android/Makefile | 2 +-
 misc/winresource.rc    | 2 +-
 src/config.h           | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15c04c360..2f298f910 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,8 +13,8 @@ set(PROJECT_NAME_CAPITALIZED "BlockColor")
 set(CMAKE_CXX_STANDARD 11)
 
 # Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing
-set(VERSION_MAJOR 2)
-set(VERSION_MINOR 0)
+set(VERSION_MAJOR 1)
+set(VERSION_MINOR 3)
 set(VERSION_PATCH 0)
 set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
 
@@ -157,7 +157,6 @@ endif()
 
 
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/builtin" DESTINATION "${SHAREDIR}")
-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/worlds" DESTINATION "${SHAREDIR}")
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/client" DESTINATION "${SHAREDIR}")
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/clientmods" DESTINATION "${SHAREDIR}")
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games" DESTINATION "${SHAREDIR}" PATTERN ".git*" EXCLUDE)
@@ -173,7 +172,7 @@ install(FILES "doc/lua_api.txt" DESTINATION "${DOCDIR}")
 install(FILES "doc/menu_lua_api.txt" DESTINATION "${DOCDIR}")
 install(FILES "doc/texture_packs.txt" DESTINATION "${DOCDIR}")
 install(FILES "doc/world_format.txt" DESTINATION "${DOCDIR}")
-install(FILES "blockcolor.conf" DESTINATION "${EXAMPLE_CONF_DIR}")
+install(FILES "blockcolor.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}")
 
 if(UNIX AND NOT APPLE)
 	install(FILES "doc/BlockColor.6" "doc/BlockColorServer.6" DESTINATION "${MANDIR}/man6")
diff --git a/build/android/Makefile b/build/android/Makefile
index c426d94b5..67c0946f6 100644
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -598,7 +598,7 @@ $(ASSETS_TIMESTAMP) : $(IRRLICHT_LIB)
 		touch ${IRRLICHT_DIR}/media/timestamp;                                     \
 		touch ${ASSETS_TIMESTAMP};                                                 \
 	fi;                                                                            \
-	if [ ${PROJ_ROOT}/blockcolor.conf -nt ${ASSETS_TIMESTAMP} ] ; then     \
+	if [ ${PROJ_ROOT}/blockcolor.conf.example -nt ${ASSETS_TIMESTAMP} ] ; then     \
 		echo "conf changed";                                                       \
 		touch ${ASSETS_TIMESTAMP};                                                 \
 	fi;                                                                            \
diff --git a/misc/winresource.rc b/misc/winresource.rc
index 90f6519d9..382d08bc5 100644
--- a/misc/winresource.rc
+++ b/misc/winresource.rc
@@ -8,7 +8,7 @@
 #if RUN_IN_PLACE
 	#define BUILDMODE "RUN_IN_PLACE=1"
 #else
-	#define BUILDMODE "RUN_IN_PLACE=1"
+	#define BUILDMODE "RUN_IN_PLACE=0"
 #endif
 
 LANGUAGE 0, SUBLANG_NEUTRAL
diff --git a/src/config.h b/src/config.h
index 799fdd12a..55a52c483 100644
--- a/src/config.h
+++ b/src/config.h
@@ -16,8 +16,8 @@
 	#define PROJECT_NAME "BlockColor"
 	#define PROJECT_NAME_C "BlockColor"
 	#define STATIC_SHAREDIR ""
-	#define VERSION_MAJOR 2
-	#define VERSION_MINOR 0
+	#define VERSION_MAJOR 1
+	#define VERSION_MINOR 3
 	#define VERSION_PATCH 0
 	#define VERSION_STRING STR(VERSION_MAJOR) "." STR(VERSION_MINOR) "." STR(VERSION_PATCH)
 #endif