From 7727fee1d083d33d8d45befe217c4e66bfe47de3 Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Fri, 24 Feb 2023 14:00:34 -0600
Subject: [PATCH] Fix hemmit merge

---
 addons/artillerytables/RscRangeTable.hpp |  2 --
 addons/laser/script_component.hpp        |  2 +-
 hemtt.toml                               | 24 ++++++++++++++++++++++--
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/addons/artillerytables/RscRangeTable.hpp b/addons/artillerytables/RscRangeTable.hpp
index 9e2502b637..424dd10995 100644
--- a/addons/artillerytables/RscRangeTable.hpp
+++ b/addons/artillerytables/RscRangeTable.hpp
@@ -1,5 +1,3 @@
-#define ST_RIGHT 1
-
 class GVAR(rangeTableDialog) {
     idd = -1;
     movingEnable = 1;
diff --git a/addons/laser/script_component.hpp b/addons/laser/script_component.hpp
index 80f2a01fa3..5a1f440cbb 100644
--- a/addons/laser/script_component.hpp
+++ b/addons/laser/script_component.hpp
@@ -4,7 +4,7 @@
 
 // #define DRAW_LASER_INFO
 // #define DEBUG_MODE_FULL
- #define DISABLE_COMPILE_CACHE
+//  #define DISABLE_COMPILE_CACHE
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_LASER
diff --git a/hemtt.toml b/hemtt.toml
index a74a731e4a..d706162df8 100644
--- a/hemtt.toml
+++ b/hemtt.toml
@@ -1,6 +1,26 @@
-[project]
-name = "ACE 3"
+name = "ACE3"
+prefix = "ace"
+author = "ACE-Team"
 files = [
     "*.dll",
+    "*.so",
+    "mod.cpp",
+    "README.md",
+    "docs/README_DE.md",
+    "docs/README_PL.md",
+    "docs/README.zh-TW.md",
+    "AUTHORS.txt",
+    "LICENSE",
     "logo_ace3_ca.paa",
+    "meta.cpp"
 ]
+
+keyname = "{{prefix}}_{{version}}"
+signame = "{{prefix}}_{{version}}-{{git \"id 8\"}}"
+
+releasebuild = [
+    "@zip ace3_{{semver.major}}.{{semver.minor}}.{{semver.patch}}"
+]
+
+[header_exts]
+version= "{{git \"id 8\"}}"