Commit Graph
6384 Commits
Author SHA1 Message Date
Anuken 9da2d1ee9a Merge remote-tracking branch 'origin/master' 2020-02-10 20:22:09 -05:00
Anuken 6882a9a355 Added persistent message server function 2020-02-10 20:22:03 -05:00
GioIacca9andGitHub 941449c502 Updated "Full implementation of #1494" (#1541) 2020-02-09 22:26:47 -05:00
Daniel JenningsandGitHub baab36bfc5 Trim schematic string before calling Base64Decoder (#1537)
This fixes getting the "Length of Base64 encoded input string is not a multiple of 4." error when importing schematics that have whitespace at the start/end of them, which is easy to accidentally have without knowing by when copying the schematic codes from random different web pages.
2020-02-08 16:41:33 -05:00
Anuken f3893533a4 Cleanup 2020-02-08 11:08:31 -05:00
Prosta4okuaandGitHub 0a53c4c1be Update bundle_uk_UA.properties 2020-02-08 12:26:09 +02:00
Prosta4okuaandGitHub d7eb0d3ba3 Update bundle_uk_UA.properties 2020-02-08 12:23:50 +02:00
Anuken 3a2fef3bd7 Merge remote-tracking branch 'origin/master' 2020-02-07 20:52:03 -05:00
Anuken 9ccf95971e Fixed small launch items button 2020-02-07 20:51:59 -05:00
valtsu41andGitHub 9b36125b0c Finnish translation & grammar update (#1473)
* Finnish translation & grammar update

* More grammar correcting and making things more native

* Just a little more fine-tuning

* Fixes
2020-02-07 20:42:14 -05:00
Anuken 0ffcd0b94c Fixed #1507 / Fixed #1504 2020-02-07 20:21:45 -05:00
Anuken a6801af128 Use zip files when exporting 2020-02-07 20:11:43 -05:00
Anuken 30ea039246 Fixed #1521 2020-02-07 20:11:05 -05:00
Anuken 5a5945cc52 Merge remote-tracking branch 'origin/master' 2020-02-07 20:09:45 -05:00
Anuken e5fd3dec4c Fixed #1526 2020-02-07 20:09:37 -05:00
7b586ea043 Fix a typo (#1528)
* Fix a typo

* Update core/src/mindustry/mod/Mods.java

Co-Authored-By: Patrick 'Quezler' Mounier <Quezler@me.com>

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>
2020-02-07 08:25:26 -05:00
Petr Gašparík e98808bc46 Czech for server categories! 2020-02-07 12:35:09 +01:00
Petr Gašparík bc37415a10 Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-02-07 12:32:33 +01:00
Prosta4okuaandGitHub 619b2ba897 Update bundle_uk_UA.properties 2020-02-07 12:42:59 +02:00
Anuken 37a9311202 Merge remote-tracking branch 'origin/master' 2020-02-06 20:25:17 -05:00
Anuken e9f37ea68e Removed entity processor files 2020-02-06 20:25:10 -05:00
Prosta4okuaandGitHub 59431b223b Update bundle_uk_UA.properties 2020-02-06 23:38:45 +02:00
MEEP of FaithandGitHub da5755b7c1 For consistancy (#1517)
Swap "liquids" with "liquid." Also proposing because the category for liquid blocks is "liquid" and not "liquids" when modding.
2020-02-06 14:46:33 -05:00
Anuken 70c06b58ef Conveyor cleanup 2020-02-06 11:38:36 -05:00
VanguardandGitHub 9b30b452a1 3 changed lines
servers.local
servers.remote
servers.global
2020-02-06 03:39:32 +03:00
VanguardandGitHub c254a702fc 3 new lines
servers.local
servers.remote
servers.global
2020-02-06 03:34:19 +03:00
Anuken 4a2c6c571f Merge remote-tracking branch 'origin/master' 2020-02-05 19:02:02 -05:00
Anuken a5fd881f8d Full implementation of #1494 2020-02-05 19:01:53 -05:00
d59b23b835 bundle_de.properties: merge PRs + further improvements (#1482)
* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* add minor missing changes from discussion in #799

* fix duplicated text in german translation (configure.locked)

* apply German translation suggestions from PR comment

This commit applies suggestions from the comment at https://github.com/Anuken/Mindustry/pull/783#pullrequestreview-299643677

Co-authored-by: Anuken <arnukren@gmail.com>
Co-authored-by: Silvério Santos <ssantos@web.de>
2020-02-05 18:37:21 -05:00
Patrick 'Quezler' MounierandGitHub e06d8eabec [formatting] add newline to file(s) (#1508)
* Trail appropriate files with a new line

* For some ironic reason it ignored itself

Probably because it wasn’t tracked/commited yet.

* Rename newlines to server executable naming pattern
2020-02-05 18:36:56 -05:00
Arkanic ce7eccf524 i forgot -base 2020-02-05 18:10:57 +00:00
Patrick 'Quezler' MounierandGitHub 8bb533f646 3rd times the charm (#1509) 2020-02-05 13:06:16 -05:00
Petr Gašparík 39b35dd9cb Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-02-05 08:34:59 +01:00
Arkanic ff06a005a0 become exist 2020-02-05 00:53:15 +00:00
ArkanicandGitHub fd500f5405 heh make branch 2020-02-05 13:27:36 +13:00
Anuken 67106abb9b Updated arc 2020-02-03 20:30:18 -05:00
ea6490cf9f Improved ItemModule::take() behavior (#1495)
* Improved ItemModule::take() behavior

The original take() behavior spams items in whatever order they appear in the items list until each index is depleted, which is problematic when non-specific unloaders are competing against dedicated unloaders for a low-index resources.

My modification makes the take() loop persistent so take() will do complete laps around the item list starting from wherever the previous call returned from, never repeating the same item twice in a row unless there is nothing else to return. A significant improvement IMO.

How is this an improvement? With the original behavior, if you converge a bunch of belts on a storage block or launcher, want to unload a few belts of specific resources (ex.: copper, lead, silicon and titanium for surge alloy) and pass everything else including overflows along using non-specific unloaders, you are out of luck when the resources you want are at the top of the list since most of those will get swept away by non-specific unloaders. With the rotating take(), non-specific unloaders are equal-opportunity across all available resources, which gives single-resource unloaders that many more chances to unload more of their resources before non-specific unloaders get to them. It also reduces the rate at which items further down the list that may hardly ever get touched by the existing implementation will race toward the storage block's cap. The even drain across all items will help prevent things like mass driver stalls due to receivers filling up with an excess resource that isn't getting cleared.

It would be even nicer if dedicated unloaders had priority over non-specific ones (non-specific unloaders don't touch resources with dedicated unloaders unless the dedicated unloaders are overflowing), though that would require a rework beyond my current "getting the stupid IDE and tool chains to work" level of familiarity with Java development.

To sum it up: trivial change, big impact for people who like mixing belts and sorting them out with unloaders.

* Update core/src/mindustry/world/modules/ItemModule.java

Co-Authored-By: Patrick 'Quezler' Mounier <Quezler@me.com>

* Update core/src/mindustry/world/modules/ItemModule.java

Co-Authored-By: Patrick 'Quezler' Mounier <Quezler@me.com>

* Formatting

* Anuken's take() rotator.

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>
2020-02-03 20:27:25 -05:00
Patrick 'Quezler' MounierandGitHub 627321304d zzzz (#1503) 2020-02-03 15:55:53 -05:00
ArkanicandGitHub d2c2fd7d5f aaaa (#1502) 2020-02-03 14:44:54 -05:00
DeltaNedasandGitHub fea9f51513 !dir.exists() and new line 2020-02-03 18:36:17 +00:00
DeltaNedasandGitHub 4709b5dddc remove old mainScript, it is always main.js 2020-02-03 18:35:24 +00:00
GioIacca9andGitHub b4be655d0c Translated stat.playtime (#1485) 2020-02-03 12:54:06 -05:00
LauweJosterandGitHub 19da1e1306 Update bundle_nl.properties (#1499)
Improved some grammar and sentencing. Also added a few translations.
2020-02-03 12:37:28 -05:00
Patrick 'Quezler' MounierandGitHub 9bc24ae47a Darken yellow square on nucleus core (#1497)
#1496
2020-02-03 08:51:19 -05:00
Petr Gašparík aef5fd85b2 Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-02-03 10:05:06 +01:00
Anuken ad84329688 Abstract component method support 2020-02-02 17:21:35 -05:00
Anuken ae6d33cad1 Bugfixes 2020-02-02 16:44:51 -05:00
Anuken ad9dd83032 Better entity code generation + minor refactoring 2020-02-02 16:13:25 -05:00
Anuken 382ca09f6e Merge branches 'master' and 'splinterface' of https://github.com/Anuken/Mindustry 2020-02-02 13:59:41 -05:00
Anuken c978410cb3 Scale cleanup / Name cleanup 2020-02-02 13:59:24 -05:00