mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-27 16:09:57 +07:00
Code Issues Packages Projects Releases Wiki Activity
6,547 Commits 4 Branches 160 Tags 2.3 GiB
d611dd107a
Commit Graph

5560 Commits

Author SHA1 Message Date
Anuken
4265d40024 Movement 2020-02-07 13:02:24 -05:00
Anuken
861b3ac3f4 Tweaks 2020-02-07 11:46:10 -05:00
Anuken
007a1bd1d2 Unit definitions 2020-02-07 11:04:58 -05:00
Anuken
b9841f9cfa a mess 2020-02-07 10:47:58 -05:00
Anuken
33e818a757 Entity name mapping 2020-02-07 09:36:51 -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
Prosta4okua
619b2ba897
Update bundle_uk_UA.properties 2020-02-07 12:42:59 +02:00
Anuken
eeae5149a1 Basic unit rendering 2020-02-06 22:08:31 -05: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
Anuken
f83b6728cf ? 2020-02-06 20:24:30 -05:00
Prosta4okua
59431b223b
Update bundle_uk_UA.properties 2020-02-06 23:38:45 +02:00
Anuken
e3136e9e09 more rendering 2020-02-06 14:58:12 -05:00
MEEP of Faith
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
ddecb2d831 Actual updating and rendering 2020-02-06 13:40:07 -05:00
Anuken
6fe5663f79 Autogenerated render layer groups 2020-02-06 13:20:03 -05:00
Anuken
70c06b58ef Conveyor cleanup 2020-02-06 11:38:36 -05:00
Anuken
6a99a3922e Cleanup 2020-02-06 11:37:22 -05:00
Anuken
a11f6efe0a Rudimentary rendering 2020-02-05 23:04:48 -05:00
Anuken
8172e69f8c it launches 2020-02-05 22:08:57 -05:00
Anuken
dfecfa3964 . 2020-02-05 20:11:49 -05: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
martin-mfg
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' Mounier
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
Anuken
f6b1420103 c l e a n u p 2020-02-05 18:28:19 -05:00
Anuken
84748afc55 the errors are back 2020-02-05 15:00:35 -05:00
Arkanic
ce7eccf524 i forgot -base 2020-02-05 18:10:57 +00:00
Anuken
eb0ea9030b ? 2020-02-05 13:08:48 -05:00
Anuken
da97aee8e4 it never ends 2020-02-05 13:03:22 -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
Arkanic
fd500f5405
heh make branch 2020-02-05 13:27:36 +13:00
Anuken
a7b39e56bd Cleanup continues 2020-02-04 18:00:32 -05:00
Anuken
012421afcb Class ID mapping 2020-02-04 13:57:42 -05:00
Anuken
be50997f94 Merge branches '6.0' and 'splinterface-impl' of https://github.com/Anuken/Mindustry into splinterface-impl 
# 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
 2020-02-04 12:25:18 -05:00
Anuken
878f570472 Cleanup 2020-02-04 12:23:38 -05:00
Anuken
36b9451e01 Read-only component fields / Removed get/set prefix 2020-02-04 12:14:09 -05:00
Anuken
1d0cfd4435 UnitType cleanup 2020-02-04 11:40:56 -05:00
Anuken
006004fd70 Decal cleanup 2020-02-04 09:39:12 -05:00
Anuken
a07e275e11 Entity groups 2020-02-04 01:03:34 -05:00
Anuken
67106abb9b Updated arc 2020-02-03 20:30:18 -05:00
InvalidError404
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
Anuken
a942ed2cad More cleanup 2020-02-03 20:24:49 -05:00
Anuken
88d2ec5be8 Cleanup 2020-02-03 15:59:54 -05:00
Anuken
141cf518a2 Refactoring 2020-02-03 14:07:06 -05:00
DeltaNedas
fea9f51513
!dir.exists() and new line 2020-02-03 18:36:17 +00:00
DeltaNedas
4709b5dddc
remove old mainScript, it is always main.js 2020-02-03 18:35:24 +00:00
GioIacca9
b4be655d0c
Translated stat.playtime (#1485) 2020-02-03 12:54:06 -05:00
LauweJoster
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' Mounier
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
f937cb30f0 More components, less entities 2020-02-02 23:38:16 -05:00
Anuken
f2f31120a0 Gradual component conversion 2020-02-02 20:17:22 -05:00
Anuken
63fa50d111 Implementation begins 2020-02-02 18:33:59 -05: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
Anuken
5eb3f0f3de Interface + base component support 2020-02-02 12:25:46 -05:00
Anuken
acb3438cc8 More entity processor features 2020-02-02 11:51:58 -05:00
DeltaNedas
a9f07f3603
formatting 2020-02-02 15:49:10 +00:00
Patrick 'Quezler' Mounier
4c369dd17c
Hide drop zone warning if you're part of the wave team (#1492) 2020-02-02 10:41:09 -05:00
DeltaNedas
c458c77322 cleanup 2020-02-02 13:40:53 +00:00
DeltaNedas
b93692ad41 yes 2020-02-02 13:40:38 +00:00
DeltaNedas
d84217300c fixed error message 2020-02-02 12:58:00 +00:00
DeltaNedas
49ab7ceb77 main.js required now 2020-02-02 12:44:37 +00:00
Anuken
7ddfcbfabd Utility method copying 2020-02-02 00:39:29 -05:00
Anuken
da2aee7d31 Entity components based on code generation - experiment 2020-02-01 23:54:41 -05:00
DeltaNedas
4c45716149 first part of what cat wants 2020-02-02 02:49:47 +00:00
Anuken
62179233ef Bugfixes 2020-02-01 17:17:03 -05:00
DeltaNedas
51bc5c3b74
local changes 2020-02-01 18:28:25 +00:00
DeltaNedas
a45a14025d
oops 2020-02-01 18:26:38 +00:00
Anuken
eabebcefc7 Disabled data folder button due to terrible file manager support 2020-01-31 23:09:21 -05:00
DeltaNedas
e1a215ae0b
wrapper works now 2020-02-01 01:18:18 +00:00
Anuken
63d84bead3 Cleanup 2020-01-31 20:10:21 -05:00
DeltaNedas
d872656bc5
it works sorta! 2020-01-31 23:51:33 +00:00
Anuken
51b4824c92 Fixed #1484 2020-01-31 11:07:25 -05:00
Petr Gašparík
b4e9e6be32 Czech: added Time played + small format corr. 2020-01-31 13:16:27 +01:00
Petr Gašparík
737e3145ec Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-01-31 13:13:51 +01:00
Anuken
2721aa550d Implemented #1444 2020-01-30 22:56:17 -05:00
Anuken
f92b91c17b Switched to arc bloom 2020-01-30 17:50:35 -05:00
Anuken
221b28c153 Merge remote-tracking branch 'origin/master' 2020-01-30 17:43:48 -05:00
Anuken
7c2541afa2 Fixed bloom black screen on iOS/Android 2020-01-30 17:43:36 -05:00
Petr Gašparík
bfa24cca4c Merge branch 'v103.3' of https://github.com/PetrGasparik/Mindustry; branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-01-30 16:06:46 +01:00
DeltaNedas
9da505119b
it compiles but cant find module 
help
 2020-01-30 00:53:05 +00:00
DeltaNedas
677debd475
testing script loading stuff 
is not allowed in console, only from `LoadedMod`s.
 2020-01-30 00:38:51 +00:00
DeltaNedas
864c73f791
make it semi work maybe 
still completely insecure
 2020-01-30 00:21:50 +00:00
DeltaNedas
9ed7719464
compile dammit 2020-01-30 00:04:42 +00:00
DeltaNedas
187e1f5848
create new branch 2020-01-29 23:52:58 +00:00
Vam-Jam
36782a2454
[Fix] lastMessage doesnt change if prevented by antispam (#1471) 
Fixes issue #1470
 2020-01-29 11:32:41 -05:00
Prosta4okua
6a48a1e0a3
Update bundle_uk_UA.properties 2020-01-29 01:12:12 +02:00
Prosta4okua
d0faecbea5
Update bundle_uk_UA.properties 2020-01-29 01:07:24 +02:00
Anuken
867a642859 Fixed #1460 2020-01-28 13:44:06 -05:00
Anuken
89e1c5afc0 Conveyor tweaks 2020-01-28 00:21:05 -05:00
Anuken
ad6e0bcd0f Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework 
# Conflicts:
#	android/src/mindustry/android/AndroidLauncher.java
#	annotations/src/main/java/mindustry/annotations/SerializeAnnotationProcessor.java
#	annotations/src/main/java/mindustry/annotations/impl/AssetsAnnotationProcessor.java
#	build.gradle
#	core/assets-raw/fontgen/config.json
#	core/assets/bundles/bundle_cs.properties
#	core/assets/bundles/bundle_it.properties
#	core/assets/fonts/font.ttf
#	core/assets/fonts/icon.ttf
#	core/assets/icons/icons.properties
#	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/content/UnitTypes.java
#	core/src/mindustry/core/NetClient.java
#	core/src/mindustry/core/NetServer.java
#	core/src/mindustry/entities/bullet/BulletType.java
#	core/src/mindustry/entities/type/TileEntity.java
#	core/src/mindustry/maps/filters/FilterOption.java
#	core/src/mindustry/mod/Scripts.java
#	core/src/mindustry/ui/Fonts.java
#	core/src/mindustry/ui/dialogs/DeployDialog.java
#	core/src/mindustry/ui/fragments/HudFragment.java
#	core/src/mindustry/ui/fragments/MenuFragment.java
#	core/src/mindustry/world/blocks/production/Cultivator.java
#	core/src/mindustry/world/blocks/units/CommandCenter.java
#	gradle.properties
#	tools/src/mindustry/tools/FontGenerator.java
 2020-01-27 15:51:02 -05:00
Anuken
a2933e030a More severe votekick 2020-01-27 15:43:17 -05:00
Anuken
5ad0193a86 Fixed reduced conveyor edge throughput 2020-01-27 13:15:12 -05:00
Anuken
65211a6021 Fixed #1447 2020-01-27 11:01:48 -05:00
Anuken
b7e1adb8b1 Fixed 103 network compatibility 2020-01-27 10:19:18 -05:00
Petr Gašparík
69069e2ef3 Czech translation - mod display 2020-01-27 11:32:31 +01:00
Anuken
b9e8694e68 Added synced server label + effect methods 2020-01-27 00:25:32 -05:00
Anuken
cd1ed97e52 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-01-27 00:11:24 -05:00
Anuken
a61234d21e Minor tweaks 2020-01-26 21:50:55 -05:00
키에르
9499b9dfaf Add custom text on screen (#1448) 2020-01-26 17:56:11 -05:00
Anuken
9baaacc8ac Crash fix 2020-01-26 16:55:24 -05:00
Anuken
621233a5b3 More optimization 2020-01-26 16:12:11 -05:00
Anuken
9a3245c23e Clamp 2020-01-26 15:13:55 -05:00
Anuken
6fe2697185 2x faster conveyor optimization 2020-01-26 15:04:00 -05:00
Anuken
adbfb15932 Cleanup 2020-01-26 13:13:01 -05:00
Anuken
93cada6a16 Conveyor benchmark test 2020-01-26 11:40:09 -05:00
Anuken
0d5dd146ef Fixed #1451 2020-01-26 10:58:14 -05:00
Nickibosss
1207fb1440 Update bundle_it.properties (#1431) 2020-01-25 17:51:43 -05:00
Petr Gašparík
8584fae07a Czech translation - update (#1432) 2020-01-25 17:51:32 -05:00
Ali-C-Ila
0a661766be Update bundle_zh_TW.properties (#1438) 2020-01-25 17:51:24 -05:00
Prosta4okua
fb6cb4829f Update bundle_uk_UA.properties (#1434) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2020-01-25 17:51:17 -05:00
Anuken
e14a36a97e Fixed #1445 2020-01-25 17:50:59 -05:00
Anuken
ca69aafd11 Fixed #1440 2020-01-25 10:44:46 -05:00
Anuken
923d576a5f Fixed #1436 / Fixed crawlers not exploding 2020-01-24 23:21:23 -05:00
Anuken
69711151a5 Bugfixes 2020-01-24 18:48:26 -05:00
Anuken
aefc4ed83c Better annotation processing 2020-01-24 18:31:54 -05:00
Anuken
83f44abb5a Suppress d/c messages when necessary 2020-01-24 14:27:23 -05:00
Anuken
f2bc3e78d7 Fixed #1429 2020-01-24 14:00:06 -05:00
Anuken
2fe6a3525b Added null check for attribute 2020-01-24 13:37:23 -05:00
Anuken
78fb427120 Minor fixes 2020-01-24 13:02:03 -05:00
Anuken
b9876e267b Headless load fix 2020-01-24 12:31:34 -05:00
Anuken
4c1459c47e Fixed page limits in /help 2020-01-24 11:50:51 -05:00
Vanguard
5b9b684ccd PRE 103 RU_updates (#1425) 
* 1 changed line, 1 removed line

Changed:
keybind.zoom.name

Removed:
keybind.zoom_hold.name

Moved some lines around to keep them in the same order with bundle.properties

* 1 changed line

tutorial.intro

* 3 new lines, 3 changed lines

New:
mod.erroredcontent
mod.errors
mod.noerrorplay

Changed:
mod.requiresversion
mod.remove.confirm
details

* 2 changed lines

mods.guide
mod.import.github

* 1 new line

link.feathub.description

* 1 changed line

item.graphite.description

* 1 changed line

block.mass-driver.description

* 9 new lines, 1 changed line

New:
be.update
be.update.confirm
be.updating
be.ignore
be.noupdates
be.check
server.kicked.serverRestarting
setting.coreselect.name
rules.blockhealthmultiplier

Changed:
wave.enemy

* 3 changed lines

quit.confirm.tutorial
setting.coreselect.name
public.confirm

* 22 changed lines

mod.missing
item.plastanium.name
block.plastanium-wall.name
block.plastanium-wall-large.name
block.plastanium-compressor.name
item.scrap.description
item.spore-pod.description
item.blast-compound.description
liquid.oil.description
unit.revenant.description
block.multi-press.description
block.plastanium-compressor.description
block.spore-press.description
block.power-source.description
block.force-projector.description
block.conveyor.description
block.mass-driver.description
block.liquid-junction.description
block.phase-conduit.description
block.thorium-reactor.description
block.blast-drill.description
block.cyclone.description

* 3 new lines, 2 removed lines

New:
setting.bridgeopacity.name
block.liquid-void.name
block.liquid-void.description

Removed:
block.signal
block.editsignal

* 1 new line

data.openfolder

* 1 changed line

block.cryofluidmixer.description

* 2 new lines

block.underflow-gate.name
block.underflow-gate.description

* 2 changed lines

unit.thousands
unit.millions

* 3 new lines

blocks.tiles
blocks.affinities
setting.playerlimit.name

* 1 changed line

block.underflow-gate.name

* 1 changed line

unit.thousands

* 1 changed line

blocks.affinities

* 1 changed line (reverted)

unit.thousands

Co-authored-by: Anuken <arnukren@gmail.com>
 2020-01-24 11:31:14 -05:00
Anuken
8141361a30 Fix script whitelist 2020-01-24 11:27:47 -05:00
Anuken
99e51411d5 Implemented #1048 2020-01-24 11:24:35 -05:00
Anuken
4ca1a506b6 Merge remote-tracking branch 'origin/master' 2020-01-24 11:17:22 -05:00
Anuken
125d6ef8cd Cleanup 2020-01-24 11:17:18 -05:00
Petr Gašparík
76d425a920 Czech translation for Android and Steam + continuous updates (#1383) 
* Improving Czech translation, up to line  374 now

* Czech translation, revisited up to line 468

* Translation revision up to line 510.

* Czech translation - small fixes here and there.

* Czech translation - small fixes here and there.

* Czech lang. - Fixed some typos found by @dusekdan

* Czech - revision up to line 564

* Czech tr. - small fixes to fit into GUI

* Czech tr. - small fixes after checking GUI

* Czech tr. - revision up to line 670 done

* Czech tr. - revisited up to line 748.

* Czech tr. - now it has the same length as English

* Czech translation - polished up to line 1062
Only tutorial left...

* Czech translation - small fixes

* Czech tr. - revisited up to line 1070

* Czech translation - revision done up line 1084.
New: tutorial translated, new key incorporated.

* Czech translation done up to line 1100.

* Czech translation up to line 1105

* Czech translation - small corrections, consistency

* Czech translation up to line 1124

* Czech translation - done up to line 1159

* Czech translation up to line 1071

* Czech translation, up to line 1177

* Czech translation, done up to line 1203

* Czech translation REVISION DONE!

* Czech files for Steam!

* Czech - full translation for Android

* Czech translation - fixing typos found by @dusekdan
thank you!

* Czech traslation, back to "Workshop" from "Dílna"
...as it is the same name on Steam

* Czech translation - underflow gate
 2020-01-24 11:12:41 -05:00
Prosta4okua
9ef23ace95 [WIP]Update bundle_uk_UA.properties (#1363) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2020-01-24 11:12:33 -05:00
Anuken
d58098ca94 Added server info toast method 2020-01-24 11:03:15 -05:00
Anuken
1a6436355c Merge remote-tracking branch 'origin/master' 2020-01-24 10:26:16 -05:00
Anuken
63c277f78e Implemented mod name display in content desc 2020-01-24 10:26:10 -05:00
xzarfs
dda12af593 Update finnish language properties (#1396) 
Major imporvements to the finish language.

Changed finnish word 'aalto' to 'taso' (both mean wave but 'aalto' is the one in a ocean)
 2020-01-24 10:09:48 -05:00
GioIacca9
3dda4badac Update bundle_it.properties (#1428) 2020-01-24 10:04:37 -05:00
Anuken
a4e820f907 Added default ore flags for modded ores 2020-01-23 20:20:04 -05:00
Anuken
bc56b8127f Merge remote-tracking branch 'origin/master' 2020-01-23 19:17:16 -05:00
Anuken
b16ad97d93 Updated font 2020-01-23 19:17:11 -05:00
martin-mfg
6ffb470916 Update bundle_de.properties (#1423) 
Again some changes and translations

Co-authored-by: Amon-Senpai <56207045+Amon-Senpai@users.noreply.github.com>
 2020-01-23 18:57:24 -05:00
Anuken
92df6e6e06 Merge remote-tracking branch 'origin/master' 2020-01-23 18:33:38 -05:00
Anuken
f4940fffab Minor tweaks 2020-01-23 18:33:32 -05:00
Vanguard
847a1a738e RU updates (#1354) 
* 1 changed line, 1 removed line

Changed:
keybind.zoom.name

Removed:
keybind.zoom_hold.name

Moved some lines around to keep them in the same order with bundle.properties

* 1 changed line

tutorial.intro

* 3 new lines, 3 changed lines

New:
mod.erroredcontent
mod.errors
mod.noerrorplay

Changed:
mod.requiresversion
mod.remove.confirm
details

* 2 changed lines

mods.guide
mod.import.github

* 1 new line

link.feathub.description

* 1 changed line

item.graphite.description

* 1 changed line

block.mass-driver.description

* 9 new lines, 1 changed line

New:
be.update
be.update.confirm
be.updating
be.ignore
be.noupdates
be.check
server.kicked.serverRestarting
setting.coreselect.name
rules.blockhealthmultiplier

Changed:
wave.enemy

* 3 changed lines

quit.confirm.tutorial
setting.coreselect.name
public.confirm

* 22 changed lines

mod.missing
item.plastanium.name
block.plastanium-wall.name
block.plastanium-wall-large.name
block.plastanium-compressor.name
item.scrap.description
item.spore-pod.description
item.blast-compound.description
liquid.oil.description
unit.revenant.description
block.multi-press.description
block.plastanium-compressor.description
block.spore-press.description
block.power-source.description
block.force-projector.description
block.conveyor.description
block.mass-driver.description
block.liquid-junction.description
block.phase-conduit.description
block.thorium-reactor.description
block.blast-drill.description
block.cyclone.description

* 3 new lines, 2 removed lines

New:
setting.bridgeopacity.name
block.liquid-void.name
block.liquid-void.description

Removed:
block.signal
block.editsignal

* 1 new line

data.openfolder

* 1 changed line

block.cryofluidmixer.description

* 2 new lines

block.underflow-gate.name
block.underflow-gate.description

* 2 changed lines

unit.thousands
unit.millions

Co-authored-by: Anuken <arnukren@gmail.com>
 2020-01-23 18:10:53 -05:00
LingLan
32b3bb2d89 Update zh_CN translate (#1412) 
* update zh_CN translate

* Update bundle_zh_CN.properties

typo fixed.

* update zh_CN translate

* update translate for underflow-gate

* translate setting.bridgeopacity.name
 2020-01-23 18:09:40 -05:00
Ali-C-Ila
9aa04a1584 Update bundle_zh_TW.properties (#1346) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2020-01-23 18:09:33 -05:00
Artur Quaresma
4fca93ff4d Update bundle_pt_PT.properties (#1351) 
A new update
 2020-01-23 18:09:25 -05:00
AmateurPotion
2455738f47 Update bundle_ko.properties (#1379) 2020-01-23 18:08:47 -05:00
Avevad
c96931a1b9 Update bundle_ru.properties (#1410) 2020-01-23 18:07:37 -05:00
GioIacca9
9efff27b77 Updated underflow gate (#1416) 
Translated:
`block.underflow-gate.name` and `block.underflow-gate.description`.
`data.openfolder`
and other minor strings
 2020-01-23 18:07:16 -05:00
Anuken
d031efe1f2 Added Steam player limit + reduced votekick cooldown 2020-01-23 17:49:53 -05:00
Anuken
235142c869 Implemented #1093 2020-01-23 15:50:03 -05:00
Anuken
288da868bf Merged #1406 manually 2020-01-23 14:53:27 -05:00
Anuken
1716076cdf Minor UI tweaks 2020-01-23 14:40:07 -05:00
Anuken
78b2fe64a3 Fixed annotation source version warnings 2020-01-22 15:59:02 -05:00
Anuken
5e977312a7 Annotation processor cleanup 2020-01-22 12:24:00 -05:00
Anuken
26e93c2f06 Cleanup 2020-01-22 11:36:13 -05:00
Anuken
85e0103ff8 UI fixes 2020-01-22 11:13:27 -05:00
Anuken
9e95ebfa11 Fixed action filter issues 2020-01-21 10:03:47 -05:00
Anuken
d74f6e4cb8 Fixed JS method conflict 2020-01-21 08:32:56 -05:00
Anuken
1a1208d092 Cleanup 2020-01-21 08:13:42 -05:00
Anuken
501ca5dd4e New tech tree layout 2020-01-20 22:39:46 -05:00
Anuken
2642c3c8b8 Layout improvements 2020-01-20 20:21:04 -05:00
Anuken
200e85d970 Added underflow gate to tech tree 2020-01-20 18:55:26 -05:00
Anuken
26676d60e1 Added underflow gates 2020-01-20 18:54:25 -05:00
Anuken
2c4dcff72d Cleanup 2020-01-20 16:15:15 -05:00
Anuken
f6595937f4 Cleanup 2020-01-20 16:14:45 -05:00
Anuken
df1a102021 Cleanup 2020-01-20 16:14:29 -05:00
Anuken
a4ac318c9e Changed deconstruct event to fire before tile removal 2020-01-20 15:00:38 -05:00
Anuken
d2bc2baefe Fixed #1401 2020-01-20 14:32:07 -05:00
Anuken
8aec6d24db Fixed #776 2020-01-20 14:28:18 -05:00
Anuken
b5258cd809 Fixed #1402 / Fixed #1404 2020-01-20 14:13:20 -05:00
Anuken
be0b13e27d Tweaks 2020-01-20 14:04:43 -05:00
Anuken
27d6bf067e Added prototype planet sector land system 2020-01-20 12:05:26 -05:00
Anuken
01e7397df5 Added preview projection 2020-01-20 11:13:20 -05:00
Anuken
b9dd6cc4b5 Cleanup 2020-01-19 21:06:45 -05:00
Anuken
85cf7e9d5c Added previously-missing icons 2020-01-19 18:45:25 -05:00
Anuken
a797618f6c Fixed #1397 2020-01-19 14:56:12 -05:00
Anuken
c0844304a6 Merge 2020-01-19 11:10:14 -05:00
Anuken
b1df52e0c8 Added self-destruct bullet property 2020-01-19 10:43:38 -05:00
Anuken
87b4c37d82 Cleanup of scripts 2020-01-19 09:49:55 -05:00
Anuken
48b623882a Bugfixes 2020-01-18 21:16:05 -05:00
Anuken
b2f9b2ef77 Planet cleanup 2020-01-18 17:03:03 -05:00
Anuken
47695f1f8c Added accurate planet generation 2020-01-18 13:24:14 -05:00
Anuken
f044f30829 Merge 2020-01-18 11:16:03 -05:00
Anuken
5328875ba5 nothing 2020-01-18 11:14:47 -05:00
Anuken
95352e1729 Added server descriptions 2020-01-18 10:05:18 -05:00
Anuken
6e6f8f3cdb Icon cleanup 2020-01-17 22:50:27 -05:00
Anuken
c61fed884b Bugfixes 2020-01-17 22:40:02 -05:00
Anuken
121301c7bd Prevented extra memory leaks 2020-01-17 21:33:14 -05:00
Anuken
569b1f788f Fixed segfault during mod loading 2020-01-17 21:28:12 -05:00
Anuken
ca519a94af Font improvements 2020-01-17 18:29:18 -05:00
Anuken
8d61ddbbd4 Added chat icons for in-game items and blocks 2020-01-17 18:08:23 -05:00
Anuken
d9e5dc8ba2 Added missing icons 2020-01-17 15:24:34 -05:00
Anuken
c3d2351b2d Various icon changes 2020-01-17 13:57:04 -05:00
Anuken
4f29c80814 Single-texture font+UI packing 2020-01-16 22:25:57 -05:00
Anuken
ce18e32826 Added font icon generate+merge pipeline 2020-01-16 17:05:20 -05:00
Anuken
0299263511 Merge branch 'master' of https://github.com/Anuken/Mindustry into font-icons 2020-01-16 11:16:10 -05:00
Anuken
c456aa3beb Fixed server host not seeing own messages 2020-01-16 11:15:17 -05:00
Anuken
3eaeac3618 Testing icon font 2020-01-16 11:10:53 -05:00
Anuken
eb79f3288c Added Android crash logging 2020-01-16 10:59:27 -05:00
Anuken
f7c4ea3e58 Weapon mount cleanup 2020-01-16 10:52:20 -05:00
Anuken
651d0f5162 Cleanup 2020-01-15 13:55:52 -05:00
Anuken
7b13597d69 Removed chat clearing after /sync is used 2020-01-15 11:48:58 -05:00
Anuken
c933652da9 Removed landscape ""lock"" on iOS / Closes #1387 2020-01-15 11:29:38 -05:00
Anuken
e5856cf73b More objects 2020-01-15 11:28:44 -05:00
Anuken
4c0302bcb1 Added search command 2020-01-15 09:31:25 -05:00
Anuken
ac66ac2c55 Merge remote-tracking branch 'origin/master' 2020-01-14 17:08:16 -05:00
Anuken
eaa86023f9 Visual tweaks 2020-01-14 17:07:39 -05:00
Anuken
2dd95a62ca Configuration 2020-01-14 16:18:26 -05:00
Petr Gašparík
9b663b548b Czech translation total revision DONE, please merge (#1344) 
* Improving Czech translation, up to line  374 now

* Czech translation, revisited up to line 468

* Translation revision up to line 510.

* Czech translation - small fixes here and there.

* Czech translation - small fixes here and there.

* Czech lang. - Fixed some typos found by @dusekdan

* Czech - revision up to line 564

* Czech tr. - small fixes to fit into GUI

* Czech tr. - small fixes after checking GUI

* Czech tr. - revision up to line 670 done

* Czech tr. - revisited up to line 748.

* Czech tr. - now it has the same length as English

* Czech translation - polished up to line 1062
Only tutorial left...

* Czech translation - small fixes

* Czech tr. - revisited up to line 1070

* Czech translation - revision done up line 1084.
New: tutorial translated, new key incorporated.

* Czech translation done up to line 1100.

* Czech translation up to line 1105

* Czech translation - small corrections, consistency

* Czech translation up to line 1124

* Czech translation - done up to line 1159

* Czech translation up to line 1071

* Czech translation, up to line 1177

* Czech translation, done up to line 1203

* Czech translation REVISION DONE!
 2020-01-14 16:00:51 -05:00
Anuken
373b842c3d Bugfix 2020-01-14 13:36:15 -05:00
Anuken
ae2dd5732a Objectification 2020-01-14 13:32:19 -05:00
Anuken
68be77fa1d Added configurable block access validation 2020-01-14 10:32:52 -05:00
Anuken
b20e0967fd Structural changes 2020-01-13 16:10:17 -05:00
Anuken
a5549bd4d2 Fixed #1372 2020-01-13 08:32:32 -05:00
Anuken
899a12eddb Elevation 2020-01-13 07:45:11 -05:00
Anuken
acaeb19fe1 Fixed #1364 2020-01-12 20:21:52 -05:00
Anuken
c637ec15ff Deployment dialog replaced 2020-01-12 20:01:32 -05:00
Anuken
e6f1d194ae Improved planet generation 2020-01-12 14:11:47 -05:00
Anuken
dbb06f8abd Extra clamping 2020-01-12 12:16:51 -05:00
Anuken
18ce4b6bde Cleanup 2020-01-12 12:16:08 -05:00
Anuken
8364ca6b17 Fixed #1340 2020-01-12 11:19:24 -05:00
Anuken
c2cb308081 Object cleanup / Planet mesh class 2020-01-12 00:24:35 -05:00
Anuken
bbf87df373 a revelation 2020-01-11 23:41:12 -05:00
Anuken
dbc45985ce Added log file 2020-01-11 20:09:20 -05:00
Anuken
d6dec002c1 Added remote tile set/remove methods 2020-01-11 19:32:08 -05:00
Anuken
4aa4e15de5 Arc 2020-01-11 19:21:37 -05:00
Anuken
7e7d2019af Made Android files external 2020-01-11 19:21:16 -05:00
Anuken
10634af104 Fixed #1360 2020-01-11 17:11:51 -05:00
Anuken
6d30840eb1 Fixed #1358 2020-01-11 12:57:21 -05:00
Anuken
7437100c96 Merge remote-tracking branch 'origin/master' 2020-01-11 12:50:08 -05:00
Anuken
35835cacd3 Fixed #1355 2020-01-11 12:47:54 -05:00
Anuken
fbedc95ad9 Mesh-based rendering 2020-01-11 10:44:07 -05:00
Anuken
f26e0b4609 Hexagonal planet 2020-01-11 00:39:37 -05:00
FranLamark
1d8de2d222 Update bundle_es.properties (NEW!) (#1352) 
(Nuevas cosas agregadas dentro del juego (Por Anuke) y traducidas al español por mi y otros, aparte de un retoque en algunas traducciones con errores/letras de más)
Solo para la versión en español.
(New things added within the game (By Anuke) and translated into Spanish by me and others, apart from a touch-up in some translations with more errors / lyrics)
Only for the Spanish version.
 2020-01-10 22:16:06 -05:00
Anuken
f918cdeced More rendering stuff 2020-01-10 20:27:10 -05:00
Anuken
6f3c771d73 Refactoring 2020-01-10 17:28:37 -05:00
Anuken
49137d4f58 an actual planet 2020-01-10 15:54:39 -05:00
Anuken
e45df98f26 Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0 
# Conflicts:
#	core/src/mindustry/graphics/Bloom.java
#	gradle.properties
 2020-01-10 15:19:07 -05:00
Anuken
677aa0d0bf Shortening of a few classes 2020-01-10 15:13:34 -05:00
Anuken
b123b8b074 Removed Mech/UnitType 2020-01-10 15:08:13 -05:00
Anuken
6cf7651069 Merge remote-tracking branch 'origin/master' 2020-01-10 11:39:48 -05:00
Anuken
18e73b1a4a Fixed mech pad indicators displaying onscreen 2020-01-10 11:39:38 -05:00
Anuken
f7791a2bb2 Merge; internal changes 2020-01-10 11:30:42 -05:00
GioIacca9
87442853bb Added setting.bridgeopacity.name (#1347) 2020-01-10 11:17:48 -05:00
Anuken
6050274c0f Bugfixes 2020-01-09 14:56:21 -05:00
Anuken
65ee2d2b9e Merge remote-tracking branch 'origin/master' 2020-01-09 12:07:41 -05:00
Anuken
e06f514023 Added basic subnet bans 2020-01-09 12:03:45 -05:00
Artur Quaresma
f183cf1882 Rename bundle_pt.properties to bundle_pt_PT.properties (#1339) 
It´s better since theres is a bundle_pt_BR, and not being confuse for some
 2020-01-09 08:56:00 -05:00
Anuken
2345b48e97 Merge remote-tracking branch 'origin/master' 2020-01-08 23:35:27 -05:00
Anuken
50355b45d5 Tech tree balance 2020-01-08 23:28:25 -05:00
J-VdS
9b82333a69 typo (#1343) 2020-01-08 17:36:58 -05:00
GioIacca9
08bae1fa15 Updated liquid void name and description (#1341) 2020-01-08 16:57:36 -05:00
Anuken
a7cddf97b8 Implemented bridge opacity from #1006 2020-01-08 16:16:19 -05:00
Anuken
7b4ee27fe4 Bugfixes 2020-01-08 11:37:12 -05:00
Anuken
8f208920f7 Merged in liquid void 2020-01-08 11:04:12 -05:00
Anuken
1193e18ee1 Updated bundles post-merge 2020-01-08 11:01:12 -05:00
Anuken
c04c825cec Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle_cs.properties
#	core/assets/bundles/bundle_fr.properties
#	core/assets/bundles/bundle_it.properties
#	core/assets/bundles/bundle_nl.properties
#	core/assets/bundles/bundle_pt.properties
#	core/assets/bundles/bundle_ru.properties
#	core/assets/bundles/bundle_zh_TW.properties
 2020-01-08 11:00:19 -05:00
Anuken
5ad09d6d80 Updated bundles with proper spacing 2020-01-08 10:59:29 -05:00
Patrick 'Quezler' Mounier
4a94a6c059 Update dutch localization (#1315) 
* Run gradle tools:updatebundles for nl

* Update 🇳🇱 bundle

Wow this took several hours, didn’t expect that. 🙈

* Implement @TsjipTsjip’s review

* Oops

* 〃

* 〃

* 〃

* 〃

* 〃

* 〃

* 〃
 2020-01-08 10:52:43 -05:00
Valentin Lorentz
379f0b1c71 Fix translation of "silicon" in fr_BE (#1298) 
This was fixed by 3b9980c01e in the fr translation, but not this one.
 2020-01-08 10:52:19 -05:00
Ali-C-Ila
45aa23f94d Update bundle_zh_TW.properties (#1303) 2020-01-08 10:52:07 -05:00
Petr Gašparík
27f396a1e0 Revision of Czech translation [up to line 564]: consistency with English file, terms, grammar, semantics (#1284) 
* Improving Czech translation, up to line  374 now

* Czech translation, revisited up to line 468

* Translation revision up to line 510.

* Czech translation - small fixes here and there.

* Czech translation - small fixes here and there.

* Czech lang. - Fixed some typos found by @dusekdan

* Czech - revision up to line 564

* Czech tr. - small fixes to fit into GUI

* Czech tr. - small fixes after checking GUI
 2020-01-08 10:51:48 -05:00
Artur Quaresma
b44aa8e23a Update bundle_pt.properties (#1334) 2020-01-08 10:30:27 -05:00
Alessandro Maurizio
b5d5bb21b1 Fix Steam Achievement italian translation error (#1324) 
* Fix Steam Achievement italian translation error

* Fix wrong Revenant Factory italian description
 2020-01-08 10:30:11 -05:00
Patrick 'Quezler' Mounier
406c11a14d Make rebuildable a block attribute (#1338) 2020-01-08 10:28:28 -05:00
itskatt
3cc0990a94 translate (#1311) 2020-01-08 10:22:15 -05:00
Vanguard
2692b60d21 RU updates (#1277) 
* 1 changed line, 1 removed line

Changed:
keybind.zoom.name

Removed:
keybind.zoom_hold.name

Moved some lines around to keep them in the same order with bundle.properties

* 1 changed line

tutorial.intro

* 3 new lines, 3 changed lines

New:
mod.erroredcontent
mod.errors
mod.noerrorplay

Changed:
mod.requiresversion
mod.remove.confirm
details

* 2 changed lines

mods.guide
mod.import.github

* 1 new line

link.feathub.description

* 1 changed line

item.graphite.description

* 1 changed line

block.mass-driver.description

* 9 new lines, 1 changed line

New:
be.update
be.update.confirm
be.updating
be.ignore
be.noupdates
be.check
server.kicked.serverRestarting
setting.coreselect.name
rules.blockhealthmultiplier

Changed:
wave.enemy

* 3 changed lines

quit.confirm.tutorial
setting.coreselect.name
public.confirm

* 22 changed lines

mod.missing
item.plastanium.name
block.plastanium-wall.name
block.plastanium-wall-large.name
block.plastanium-compressor.name
item.scrap.description
item.spore-pod.description
item.blast-compound.description
liquid.oil.description
unit.revenant.description
block.multi-press.description
block.plastanium-compressor.description
block.spore-press.description
block.power-source.description
block.force-projector.description
block.conveyor.description
block.mass-driver.description
block.liquid-junction.description
block.phase-conduit.description
block.thorium-reactor.description
block.blast-drill.description
block.cyclone.description
 2020-01-08 10:21:21 -05:00
GioIacca9
3e636b73ce Updated Italian translations (#1297) 
* Update it-IT translation

* Update bundle_it.properties
 2020-01-08 10:21:09 -05:00
Aaron B
24adec99f4 Updated some german translations (#1295) 
block.tar.name = Teer is right, but the only thing you get from tar is oil so why not name it oil?
 2020-01-08 10:20:56 -05:00
Spico (Spirit Guy)
af1b73be69 Update bundle_tr.properties (#1293) 
Fixed Line 418 not appearing at the right colour
 2020-01-08 10:20:21 -05:00
Anuken
6e5d506a35 Stub implementation of action filters 2020-01-08 09:37:18 -05:00
Anuken
f8f3ecd451 Merge remote-tracking branch 'origin/master' 2020-01-07 20:15:09 -05:00
Anuken
f4a819ba28 Fixed text wrapping for credits in Russian 2020-01-07 20:14:11 -05:00
Anuken
cf5e8c6463 Point planet renderer 2020-01-07 20:09:21 -05:00
Rasangus
44e745ac37 Update bundle_pt_BR.properties (#1281) 2020-01-07 19:42:48 -05:00
Anuken
c183b2dac4 Fixed incorrect variable usage 2020-01-07 15:54:51 -05:00
Anuken
1f3bab5fa3 Added untested rate limits 2020-01-07 14:16:48 -05:00
Anuken
6f25ba4541 squares. 2020-01-07 13:55:45 -05:00
Anuken
c611ce9d58 Removed old Matrix4 class 2020-01-07 11:16:04 -05:00
Anuken
3e0556de05 Merge remote-tracking branch 'origin/master' 2020-01-07 10:32:39 -05:00
Anuken
7a71468388 Updated arc hash just in case 2020-01-07 10:32:34 -05:00
Anuken
c8980163e9 3D progress 2020-01-07 10:32:00 -05:00
DeltaNedas
b0d65dcedb let mechs override drawStats and do custom power cell stuff (#1309) 
* let mechs override drawStats and do custom power cell stuff

* Update Player.java

* Update Mech.java

* Update Player.java
 2020-01-07 09:30:18 -05:00
Anuken
81602dc3d5 Cleanup 2020-01-07 00:25:33 -05:00
Anuken
c474b082cd Cleanup 2020-01-07 00:24:37 -05:00
Anuken
b730cd52d5 GL cleanup 2020-01-06 23:47:29 -05:00
Anuken
3ae8065cf1 Merge 2020-01-06 17:20:16 -05:00
Anuken
7f23803db1 Visual changes 2020-01-06 16:25:08 -05:00
Patrick 'Quezler' Mounier
dd3c4d06ac Mass driver place range assist (#1331) 2020-01-06 11:32:18 -05:00
Anuken
854e69322b Merge remote-tracking branch 'origin/master' 2020-01-06 08:38:13 -05:00
Anuken
03286b29e8 Changed Cyrillic font 2020-01-06 08:37:19 -05:00
Daniel Dušek
9d9e31948d Add - tutorial localized, description coverage++, fix broken translations (#1327) 2020-01-05 17:41:41 -05:00
Anuken
71da1f1135 Added mod listing data class 2020-01-05 00:08:48 -05:00
Anuken
6c83c111cd Merge remote-tracking branch 'origin/master' 2020-01-04 15:28:19 -05:00
Anuken
8af3b877b5 Fixed #1320 2020-01-04 15:12:29 -05:00
Dave
5f1ea4b098 UX improvements for showTextInput (#1290) 
* Added keyDown support for showTextInput (Enter, Escape, Back)

* Removed unnecessary "this"

* Added cursor autofocus on showTextInput
 2020-01-04 12:39:57 -05:00
DeltaNedas
1dd0295c45 make turnCursor: false mechs not cross eyed (#1301) 
* create new branch

* add targetDistance to weapons for mechs

players will use if turnCursor is false
 2020-01-04 12:15:43 -05:00
Anuken
ea66d9a92f Merge remote-tracking branch 'origin/master' 2020-01-04 12:10:21 -05:00
Anuken
197769a9fe Fixed #1319 2020-01-04 12:10:03 -05:00
Simon Woodburry-Forget
439605f6e8 use findAll to iterate through mod content (#1313) 2020-01-04 00:32:03 -05:00
Anuken
7fa61eaf3b Added server MOTD 2020-01-02 22:09:33 -05:00
Anuken
e214a8e7c0 Merge remote-tracking branch 'origin/master' 2020-01-02 14:10:22 -05:00
Anuken
cb76e80836 Bugfixes 2020-01-02 14:08:41 -05:00
KSean222
d161ba442f Set primitive wrapping to false for scripts (#1302) 
* Set primitive wrapping to false for scripts

* Added one newline cause why not
 2020-01-02 14:07:38 -05:00
Anuken
ddb0d7eff2 Fixed #1304 2020-01-01 12:16:23 -05:00
Anuken
7a29877a2d Bugfixes 2019-12-31 19:19:04 -05:00
Anuken
42e0238bb9 Merge remote-tracking branch 'origin/master' 2019-12-31 10:30:04 -05:00
Anuken
a78c0defc7 Fixed #1289 2019-12-31 10:29:18 -05:00
CinExPL
62947b9417 Update bundle_pl.properties (#1285) 
- reverted back some changes made by @FarmerThanos,
- fixed some errors,
- compared to english file.
 2019-12-30 23:03:46 -05:00
Anuken
e7d813ab5b Votekick config 2019-12-30 13:03:29 -05:00
Anuken
1de294cae5 Bugfixes 2019-12-30 13:00:28 -05:00
Anuken
51bd74fcc1 Build time increase of basic blocks 2019-12-30 12:55:35 -05:00
Anuken
f2e1d17ce9 Made junction harder to spam 2019-12-30 12:49:27 -05:00
Anuken
44ef5148b4 Reduced drone lag 2019-12-30 12:47:40 -05:00
Anuken
73461e0364 Added config for showing connect/disconnect messages 2019-12-30 11:36:50 -05:00
Anuken
905d7abadb Bugfixes 2019-12-29 23:49:09 -05:00
Anuken
6f61665390 Fixed some block indexing 2019-12-29 21:51:44 -05:00
Anuken
ee4f06a9c2 Bugfixes 2019-12-29 21:45:59 -05:00
Anuken
689b0b8c61 Fixed games never ending 2019-12-29 20:04:08 -05:00
Anuken
1ce9b54e10 Merge remote-tracking branch 'origin/master' 2019-12-29 18:59:17 -05:00
Anuken
39db62e3a5 Minimap tweaks 2019-12-29 18:56:29 -05:00
FarmerThanos
565064cd64 Updated bundle_pl.properties (#1273) 
* Updated bundle_pl.properties

Corrected some translations, translated some options and added a description to the Battery Diode.

* Update bundle_pl.properties

Reverted some changes
 2019-12-29 18:52:44 -05:00
Petr Gašparík
9d2e356996 Update bundle_cs.properties (#1267) 
Rewamping Czech translation. First part.
 2019-12-29 18:52:06 -05:00
Ali-C-Ila
ae5685ae46 Update bundle_zh_TW.properties (#1263) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2019-12-29 18:51:58 -05:00
Predator127
2b46b0e38e Update bundle_pt_BR.properties (#1253) 
* Update bundle_pt_BR.properties

Hi there! my name is Zero! also known as Hanko, I've translated for a long time since then.
I've been lookin through the new translations since i've been out for quite a long time, but dont think i forgot that i was a translator!

* Update bundle_pt_BR.properties
 2019-12-29 18:51:52 -05:00
GioIacca9
e200dcee33 Update bundle_it.properties (#1240) 2019-12-29 18:51:45 -05:00
PlayerBrasil13
fe63b46b67 Update bundle_pt_BR.properties (#1232) 2019-12-29 18:51:37 -05:00
SpiffyBadGaster
698e83a28a Make translation better (#1222) 
* Make translation better

* Make something better

* Fix that javaline

* Make Translate better

Not finish

* Make Translate better

Not finish
 2019-12-29 18:51:30 -05:00
Prosta4okua
150d0bf513 [WIP]Update bundle_uk_UA.properties (#1220) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* 17.12.2019
 2019-12-29 18:51:22 -05:00
Prosta4okua
5af7cd1d55 Update bundle_uk_UA.properties (#1275) 2019-12-29 18:50:59 -05:00
Anuken
b952ee0725 Tweaks 2019-12-29 18:01:10 -05:00
Anuken
670f085f78 New, improved minimap / Bugfixes 2019-12-29 17:56:10 -05:00
Anuken
811c22b84e Added camera movement while paused 2019-12-29 15:40:56 -05:00
Anuken
6edcbb9120 Bugfixes 2019-12-29 14:38:03 -05:00
Anuken
566052cabf Fixed #1272 2019-12-29 12:24:51 -05:00
Anuken
730d30ef98 Added core schematic selection setting 2019-12-29 11:40:52 -05:00
Anuken
e04c592f9e Bugfixes 2019-12-29 00:40:25 -05:00
Anuken
77b89d45d6 Cleanup / Desktop dead camera panning 2019-12-29 00:09:46 -05:00
Anuken
df4a0dd5e4 Added openServer method 2019-12-28 22:18:16 -05:00
Anuken
8c941c7165 Added update trigger / Server moddability tweaks 2019-12-28 21:34:20 -05:00
Anuken
b01d56aae8 Bugfixes 2019-12-28 18:22:20 -05:00
Anuken
497ae740aa Removed pointless "> " 2019-12-28 18:12:34 -05:00
Anuken
7543d92473 Added startup commands to server 2019-12-28 18:05:45 -05:00