Matsubaa/adventurelandX
1
0
Fork 0
mirror of https://github.com/gooba42/adventureland.git synced 2026-10-14 18:39:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Conflict fix

Browse Source
This commit is contained in:
Kaan Soral
2025-10-08 14:03:49 +03:00
parent 59d46432ee
commit b060e7fec4
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config.py
-4
View File
@@ -114,11 +114,7 @@ if is_production:
#maps["desertland"]["key"]="jayson_desertland_copy" #maps["desertland"]["key"]="jayson_desertland_copy"
pass pass
<<<<<<< HEAD
game_version=825
=======
game_version=827 game_version=827
>>>>>>> 01a2112 (Pre pull)
SALES=4+5+388+5101+125/20 #donation+manual+macos+steam+sales SALES=4+5+388+5101+125/20 #donation+manual+macos+steam+sales
update_notes=[ update_notes=[
"Last Update [August 7th]", "Last Update [August 7th]",
design/precomputed.py
-8
View File
File diff suppressed because one or more lines are too long