Fix hemmit merge

This commit is contained in:
PabstMirror 2023-02-24 14:00:34 -06:00
parent 28c166d650
commit 7727fee1d0
3 changed files with 23 additions and 5 deletions

View File

@ -1,5 +1,3 @@
#define ST_RIGHT 1
class GVAR(rangeTableDialog) {
idd = -1;
movingEnable = 1;

View File

@ -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

View File

@ -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\"}}"