Merge remote-tracking branch 'origin/master'

README.md

@@ -9,34 +9,34 @@ _[Trello Board](https://trello.com/b/aE2tcUwF/mindustry-40-plans)_
 _[Wiki](https://mindustrygame.github.io/wiki)_  
 _[Javadoc](https://mindustrygame.github.io/docs/)_ 
 
-### Contributing
+## Contributing
 
 See [CONTRIBUTING](CONTRIBUTING.md).
 
-### Building
+## Building
 
 Bleeding-edge builds are generated automatically for every commit. You can see them [here](https://github.com/Anuken/MindustryBuilds/releases).
 
 If you'd rather compile on your own, follow these instructions.
 First, make sure you have [JDK 14](https://adoptopenjdk.net/) installed. Open a terminal in the root directory, `cd` to the Mindustry folder and run the following commands:
 
-#### Windows
+### Windows
 
 _Running:_ `gradlew desktop:run`  
 _Building:_ `gradlew desktop:dist`  
 _Sprite Packing:_ `gradlew tools:pack`
 
-#### Linux/Mac OS
+### Linux/Mac OS
 
 _Running:_ `./gradlew desktop:run`  
 _Building:_ `./gradlew desktop:dist`  
 _Sprite Packing:_ `./gradlew tools:pack`
 
-#### Server
+### Server
 
 Server builds are bundled with each released build (in Releases). If you'd rather compile on your own, replace 'desktop' with 'server', e.g. `gradlew server:dist`.
 
-#### Android
+### Android
 
 1. Install the Android SDK [here.](https://developer.android.com/studio#downloads) Make sure you're downloading the "Command line tools only", as Android Studio is not required.
 2. Set the `ANDROID_HOME` environment variable to point to your unzipped Android SDK directory.
@@ -44,20 +44,29 @@ Server builds are bundled with each released build (in Releases). If you'd rathe
 
 To debug the application on a connected phone, run `gradlew android:installDebug android:run`.
 
-##### Troubleshooting
+### Troubleshooting
+
+#### Permission Denied
 
 If the terminal returns `Permission denied` or `Command not found` on Mac/Linux, run `chmod +x ./gradlew` before running `./gradlew`. *This is a one-time procedure.*
 
+#### Can not attach to current VM / Error during attachment using [...]
+
+This is a problem related to [Jabel](https://github.com/bsideup/jabel), which I use to compile Java 8-compatible bytecode while using Java 9+ language features.
+I don't know of a complete fix to this issue. However, if you're getting the error when running through IntelliJ, a workaround is to launch through Gradle *once*, which starts a daemon and avoids the problem in future runs through IntelliJ.
+
+
+
 ---
 
 Gradle may take up to several minutes to download files. Be patient. <br>
 After building, the output .JAR file should be in `/desktop/build/libs/Mindustry.jar` for desktop builds, and in `/server/build/libs/server-release.jar` for server builds.
 
-### Feature Requests
+## Feature Requests
 
 Post feature requests and feedback [here](https://github.com/Anuken/Mindustry-Suggestions/issues/new/choose).
 
-### Downloads
+## Downloads
 
 [<img src="https://static.itch.io/images/badge.svg"
      alt="Get it on Itch.io"

core/assets/bundles/bundle_es.properties

@@ -2,14 +2,14 @@ credits.text = Creado por [royal]Anuken[] - [sky]anukendev@gmail.com[]
 credits = Créditos
 contributors = Traductores y Contribuidores
 discord = ¡Únete al Discord de Mindustry!
-link.discord.description = La sala oficial del Discord de Mindustry
+link.discord.description = El servidor official de Discord de Mindustry
 link.reddit.description = El subreddit de Mindustry
 link.github.description = Código fuente del juego
 link.changelog.description = Lista de actualizaciones
-link.dev-builds.description = Versiones de desarrollo inestables
+link.dev-builds.description = Versiones en desarrollo inestables
 link.trello.description = Tablero de Trello oficial para las características planificadas
 link.itch.io.description = itch.io es la página donde podes descargar las versiones para PC y web
-link.google-play.description = Ficha en la Google Play Store
+link.google-play.description = Página de Mindustry en Google Play Store
 link.f-droid.description = Página de F-Droid del juego
 link.wiki.description = Wiki oficial de Mindustry
 link.suggestions.description = Sugerir nuevas funciones
@@ -18,7 +18,7 @@ screenshot = Captura de pantalla guardada en {0}
 screenshot.invalid = Mapa demasiado grande, no hay suficiente memoria para la captura de pantalla.
 gameover = Tu núcleo ha sido destruido.
 gameover.pvp = ¡El equipo[accent] {0}[] ha ganado!
-highscore = [accent]¡Nueva mejor puntuación!
+highscore = [accent]¡Nuevo récord de puntuación!
 copied = Copiado.
 indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
 indev.notready = This part of the game isn't ready yet
@@ -38,12 +38,12 @@ be.ignore = Ignorar
 be.noupdates = No se encontraron actualizaciones.
 be.check = Revisando actualizaciones
 
-schematic = Esquemático
+schematic = Esquema
-schematic.add = Guardar esquemático...
+schematic.add = Guardar esquema...
-schematics = Esquemáticos
+schematics = Esquemas
-schematic.replace = Un esquemático con ese nombre ya existe. ¿Deseas remplazarlo?
+schematic.replace = Un esquema con ese nombre ya existe. ¿Deseas remplazarlo?
-schematic.exists = Un esquemático con ese nombre ya existe.
+schematic.exists = Un esquema con ese nombre ya existe.
-schematic.import = Importar esquemático...
+schematic.import = Importar esquema...
 schematic.exportfile = Exportar archivo
 schematic.importfile = Importar archivo
 schematic.browseworkshop = Buscar en el Steam Workshop