mirror of
https://github.com/Anuken/Mindustry.git
synced 2024-09-11 08:15:35 +03:00
be50997f94
# Conflicts: # core/assets/sprites/block_colors.png # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/sprites/sprites3.png # core/assets/sprites/sprites5.png # core/src/mindustry/Vars.java # core/src/mindustry/entities/traits/SaveTrait.java # core/src/mindustry/maps/generators/MapGenerator.java # core/src/mindustry/ui/dialogs/DeployDialog.java # core/src/mindustry/world/blocks/Floor.java # desktop/src/mindustry/desktop/DesktopLauncher.java # gradle.properties
157 lines
2.2 KiB
Plaintext
157 lines
2.2 KiB
Plaintext
logs/
|
|
/core/assets/mindustry-saves/
|
|
/core/assets/mindustry-maps/
|
|
/core/assets/bundles/output/
|
|
/core/assets/.gifimages/
|
|
/deploy/
|
|
/out/
|
|
/desktop/packr-out/
|
|
/desktop/packr-export/
|
|
/desktop/mindustry-saves/
|
|
/desktop/mindustry-maps/
|
|
/desktop/gifexport/
|
|
/core/lib/
|
|
/ios/assets/
|
|
/core/assets-raw/sprites/generated/
|
|
/core/assets-raw/sprites_out/
|
|
/annotations/build/
|
|
/annotations/out/
|
|
/net/build/
|
|
/tools/build/
|
|
/tests/build/
|
|
/server/build/
|
|
changelog
|
|
saves/
|
|
core/assets/saves/
|
|
/core/assets/saves/
|
|
steam_appid.txt
|
|
/test_files/
|
|
/annotations/build/
|
|
/android/assets/mindustry-maps/
|
|
/android/assets/mindustry-saves/
|
|
/core/assets/gifexport/
|
|
/annotations/src/main/resources/META-INF/services
|
|
/core/assets/version.properties
|
|
/core/assets/locales
|
|
/ios/src/mindustry/gen/
|
|
/core/src/mindustry/gen/
|
|
ios/robovm.properties
|
|
packr-out/
|
|
config/
|
|
changelog
|
|
*.gif
|
|
/core/assets/saves/
|
|
/out/
|
|
/core/assets-raw/fontgen/out/
|
|
|
|
version.properties
|
|
|
|
.attach_*
|
|
## Java
|
|
|
|
*.class
|
|
*.war
|
|
*.ear
|
|
hs_err_pid*
|
|
crash-report-*
|
|
|
|
## Robovm
|
|
/ios/robovm-build/
|
|
|
|
## Android Studio and Intellij and Android in general
|
|
/android/libs/armeabi/
|
|
/android/libs/armeabi-v7a/
|
|
/android/libs/arm64-v8a/
|
|
/android/libs/x86/
|
|
/android/libs/x86_64/
|
|
/android/gen/
|
|
.idea/
|
|
*.ipr
|
|
*.iws
|
|
*.iml
|
|
/android/out/
|
|
com_crashlytics_export_strings.xml
|
|
|
|
## Eclipse
|
|
|
|
.classpath
|
|
.project
|
|
.metadata/
|
|
/android/bin/
|
|
/core/bin/
|
|
/desktop/bin/
|
|
/html/bin/
|
|
/ios/bin/
|
|
/ios-moe/bin/
|
|
*.tmp
|
|
*.bak
|
|
*.swp
|
|
*~.nib
|
|
.settings/
|
|
.loadpath
|
|
.externalToolBuilders/
|
|
*.launch
|
|
|
|
## NetBeans
|
|
|
|
/nbproject/private/
|
|
/android/nbproject/private/
|
|
/core/nbproject/private/
|
|
/desktop/nbproject/private/
|
|
/html/nbproject/private/
|
|
/ios/nbproject/private/
|
|
/ios-moe/nbproject/private/
|
|
|
|
/build/
|
|
/android/build/
|
|
/core/build/
|
|
/desktop/build/
|
|
/html/build/
|
|
/ios/build/
|
|
/ios-moe/build/
|
|
|
|
/nbbuild/
|
|
/android/nbbuild/
|
|
/core/nbbuild/
|
|
/desktop/nbbuild/
|
|
/html/nbbuild/
|
|
/ios/nbbuild/
|
|
/ios-moe/nbbuild/
|
|
|
|
/dist/
|
|
/android/dist/
|
|
/core/dist/
|
|
/desktop/dist/
|
|
/html/dist/
|
|
/ios/dist/
|
|
/ios-moe/dist/
|
|
|
|
/nbdist/
|
|
/android/nbdist/
|
|
/core/nbdist/
|
|
/desktop/nbdist/
|
|
/html/nbdist/
|
|
/ios/nbdist/
|
|
/ios-moe/nbdist/
|
|
|
|
nbactions.xml
|
|
nb-configuration.xml
|
|
|
|
## Gradle
|
|
|
|
/local.properties
|
|
.gradle/
|
|
gradle-app.setting
|
|
/build/
|
|
/android/build/
|
|
/core/build/
|
|
/desktop/build/
|
|
/html/build/
|
|
/ios/build/
|
|
/ios-moe/build/
|
|
|
|
## OS Specific
|
|
.DS_Store
|
|
Thumbs.db
|
|
android/libs/
|