Commit Graph

4921 Commits

Author SHA1 Message Date
Anuken
3d8e5bd36a Added new Cyrillic font 2019-12-15 21:31:55 -05:00
Anuken
e9ed0512f7 Removed Path API usage 2019-12-15 21:12:41 -05:00
Anuken
0cf39bf5c3 Eliminated 8 characters 2019-12-15 20:01:06 -05:00
Anuken
95a1474b9a Merge remote-tracking branch 'origin/master' 2019-12-15 19:36:38 -05:00
Anuken
53aedcee2c Cleanup 2019-12-15 19:35:04 -05:00
joshuaptfan
18bb7ba936 Prevent right-click from deconstructing when schematic is selected; allow deconstruct cancel with left-click 2019-12-15 14:26:13 -08:00
Anuken
9f3dcdf727 Fixed #1215 - made all valid floors show up in drill mine list 2019-12-15 16:29:11 -05:00
Anuken
7d2354a653 Mod path resolving fixes 2019-12-15 16:00:50 -05:00
Anuken
ab21b88001 Mod sort fix 2019-12-15 15:22:19 -05:00
Anuken
a560978dcf Sync fixes / Fixed linear filtering resetting on mod load 2019-12-15 14:30:28 -05:00
Anuken
d78d3daaf9 Updated script stub 2019-12-15 13:56:01 -05:00
Anuken
976d0f54b3 Merge branches 'master' and 'safe-mod-loading' of https://github.com/Anuken/Mindustry
# Conflicts:
#	core/src/io/anuke/mindustry/mod/Mods.java
2019-12-15 13:55:30 -05:00
Anuken
1c1db3990f Fully implemented safe content loading 2019-12-15 13:54:51 -05:00
Anuken
bcc8f65ac8 More cleanup 2019-12-14 20:49:55 -05:00
Anuken
e043f4bb66 API cleanup 2019-12-14 18:19:02 -05:00
Anuken
9d3dda035c Compile fixes 2019-12-14 12:53:37 -05:00
Anuken
6e16aab794 Merge remote-tracking branch 'origin/master' 2019-12-14 11:05:32 -05:00
Anuken
c1cf3183ac Fixed some Android-related script issues 2019-12-14 11:04:22 -05:00
Anuken
1f5a6e1bf8 Compile error fixes 2019-12-14 10:06:09 -05:00
Anuken
58e3143e2a Content cleaning 2019-12-14 09:33:07 -05:00
Anuken
9033ebcfd7
Merge pull request #1019 from Kieaer/patch-4
Add WithdrawEvent
2019-12-13 23:19:19 -05:00
Anuken
1f5e773c77
Fixed double-event firing 2019-12-13 23:15:49 -05:00
Anuken
7b1a0a42d4
Merge pull request #1206 from joshuaptfan/zoom-no-hold
Make scroll zoom by default, remove zoom hold keybind
2019-12-12 18:35:29 -05:00
키에르
9d2133814c
Update MessageBlock.java 2019-12-13 07:56:50 +09:00
joshuaptfan
6ce013a1eb Make diagonal placement keybind modify scroll to always zoom 2019-12-12 14:56:32 -08:00
Anuken
19675068ea Fixed wave time not saving properly 2019-12-12 17:09:29 -05:00
joshuaptfan
5db8520b74 Add rotation checks to mobile zoom 2019-12-12 13:52:05 -08:00
Anuken
c3e41140e0 Disabled smart resource usage for now 2019-12-12 16:39:34 -05:00
Anuken
8c1c54d49a
Merge pull request #1207 from Prosta4okua/master
1 new line
2019-12-12 16:31:04 -05:00
Anuken
01e3912827 Implemented conservative generators / Closes #804 2019-12-12 16:28:02 -05:00
Vanguard
e22f853a31
1 new line
mod.scripts.unsupported
2019-12-13 00:08:23 +03:00
Anuken
1ae20553ff Merge remote-tracking branch 'origin/master' 2019-12-12 16:07:40 -05:00
Anuken
c68eaade94
Merge pull request #1204 from Prosta4okua/master
Ukrainian translation.
2019-12-12 16:07:29 -05:00
Anuken
1461b5b357
Merge pull request #1205 from Prosta4okua/patch-2
True Ukrainian translation
2019-12-12 16:07:05 -05:00
Anuken
f0dd3b3a39
Merge pull request #1109 from ballgamer56/patch-1
Thai translation
2019-12-12 15:54:50 -05:00
Anuken
61d724ee2b Added Thai font 2019-12-12 15:54:25 -05:00
Prosta4okua
d60c2c5b63
Merge branch 'master' into patch-2 2019-12-12 22:40:30 +02:00
Prosta4okua
7e696cadaf
Update bundle_uk_UA.properties 2019-12-12 22:36:54 +02:00
Anuken
0f23bf9d08
Merge pull request #1156 from martin-mfg/master
add and fix some German translations
2019-12-12 15:34:44 -05:00
Anuken
202d79817a
Merge pull request #1149 from itskatt/french-translation
Update the French Translation
2019-12-12 15:34:06 -05:00
joshuaptfan
736737f151 Make scroll zoom by default, remove zoom hold keybind 2019-12-12 12:23:32 -08:00
AmateurPotion
fed4842222
Update bundle_ko.properties 2019-12-12 21:48:38 +09:00
Anuken
fbed11e927 Fixed #1198 2019-12-11 15:13:45 -05:00
Anuken
45ce4013d0 Merge remote-tracking branch 'origin/master' 2019-12-11 14:26:51 -05:00
Anuken
6f3d585118
Merge pull request #1183 from GioIacca9/patch-2
Update bundle_it.properties
2019-12-11 14:24:37 -05:00
Anuken
962ce7bfa6
Merge pull request #1187 from AmateurPotion/patch-22
Update bundle_ko.properties
2019-12-11 14:24:24 -05:00
Anuken
b6ee157adb
Update bundle_zh_TW.properties (#1190)
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
2019-12-11 14:24:15 -05:00
TsjipTsjip
a45a632726 Update bundle_nl_BE.properties (#1194) 2019-12-11 14:24:07 -05:00
Anuken
675e15ddca Minor refactor of class names 2019-12-11 14:23:53 -05:00
Atan599
f6b9830f82 Update bundle_cs.properties (#1192) 2019-12-11 10:51:34 -05:00
TsjipTsjip
324f6351ea "artlleryIncendiary" -> "artilleryIncendiary" (#1196)
* Gracious error with missing link description keys.

* Fix typo. "artlleryIncendiary" -> "artilleryIncendiary"

* Revert "Gracious error with missing link description keys."

This reverts commit ff5a470560.
2019-12-11 10:17:28 -05:00
Anuken
aeb6e6498e Minor server tweaks 2019-12-10 17:00:49 -05:00
Ali-C-Ila
a2382965f6
Update bundle_zh_TW.properties 2019-12-10 20:17:55 +08:00
Ali-C-Ila
09dbee1401
Update bundle_zh_TW.properties 2019-12-10 20:09:21 +08:00
Anuken
b74696b312 Fixed effect loading 2019-12-09 22:20:53 -05:00
Anuken
da849085ec Status effect cleanup 2019-12-09 22:08:22 -05:00
AmateurPotion
83a3195e34
Update bundle_ko.properties 2019-12-10 10:26:40 +09:00
AmateurPotion
8148f2a0f7
Update bundle_ko.properties 2019-12-10 10:25:42 +09:00
Anuken
0078a8cb8e Fixed scripts not working on older Android phones 2019-12-09 12:48:15 -05:00
Anuken
177cea5c5d Added block size error 2019-12-09 11:48:59 -05:00
Anuken
74dc31b10a Removed unnecessary unit types 2019-12-09 11:27:09 -05:00
Anuken
9e07b95223 Functional tweaks 2019-12-08 22:50:54 -05:00
Anuken
2554433f8d Fixed #1184 2019-12-08 21:29:03 -05:00
Anuken
e06d61dcc9 FX cleanup 2019-12-08 18:38:56 -05:00
Anuken
1aca302518 Many changes to improve scripting 2019-12-08 18:34:23 -05:00
Anuken
9f29898713 Better console / Better logging 2019-12-08 15:17:14 -05:00
Anuken
803719b216 Added mod displayName property [for color tags, etc] 2019-12-08 13:44:27 -05:00
Anuken
6588fc6581 Removed pointless base object 2019-12-08 13:14:47 -05:00
Anuken
9f4d44f0f3 Cleanup / Added server support for scripting 2019-12-08 11:00:59 -05:00
Anuken
07fb5aa88e Bugfixes 2019-12-08 10:27:06 -05:00
Anuken
b3e1436074 Fixed #1176 2019-12-08 10:09:29 -05:00
GioIacca9
98a083abdd
Update bundle_it.properties 2019-12-08 15:49:03 +01:00
Vanguard
86df70a839
1 new line
load.scripts
2019-12-08 15:34:43 +03:00
Anuken
fd202421b1 Changed console keybind to prevent confusion 2019-12-08 00:25:13 -05:00
Anuken
268f3cc3c2 Merge branches 'master' and 'rhino-js-suffering' of https://github.com/Anuken/Mindustry
# Conflicts:
#	core/src/io/anuke/mindustry/content/Blocks.java
#	gradle.properties
2019-12-08 00:15:42 -05:00
Anuken
477ebc91bf Fixed reloading 2019-12-07 21:53:50 -05:00
Anuken
fd6abaff62 More class support 2019-12-07 21:46:35 -05:00
Vanguard
ccca26d98f RU updates (#1172)
* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_uk_UA.properties

* Fixes

* Капіталізація це зло.

* Update bundle_ru.properties

* Update bundle_uk_UA.properties

* .-.

* Gm

Description

* Oof

* ЈҮУКЕНГШҺЗХҸЖДЛОРПАВЫӘЧСМИТҒБӨ

* dada

* Update upload-build.sh

* Update upload-build.sh

* test

teeest

* tesy

tesssy

* Translate new descriptions

* й

* Ukrainian finished. Fixed some errors.

* Translated everything. Maybe.

* /

* 1

* Added tutorial. Thank to Slava0135 and ymomfe.

* 1

* 1

* WATER

WATER

* [[]]

* 1

* gmmm

/-/-/-/

* idk what i changed

* Обновление и корректировка строк с 1 по 90

* router

* Обновление и корректировка строк с 87 по 252

Обновление и корректировка строк с 87 по 252, а так же правка предыдущих.
- 35 строку лучше привести в соответствии с оригинальным текстом, без дополнений и пояснений.
- 103 строка не переводится в соответствии с https://semver.org/lang/ru/ , хотя это не жёсткое правило, поскольку не влияет непосредственно на алгоритм работы с версиями.
- 187 Предлагаю эту строку перевести как 'Настройки карты', не смотря на оригинальный текст (соответственно и 230, 231).

* router

* Обновление и корректировка строк с 253 по 321 - "WorldEditor Update"

Обновление и корректировка строк с 253 по 321, а так же предыдущих.
- Разобраться с 297 строкой ("filter.option.percentile").
- Разобраться с местами применения 322 строки.

* озарение в переводе ;D

* Fixed "В"

* Unfinished Ukrainian language.

* Small fixes.

* Обновление и корректировка строк с 322 по 377 - "Campaign Update"

Обновление и корректировка строк с 322 по 377, а так же предыдущих.
- По прежнему нужно разобраться с 297 строкой ("filter.option.percentile"). Добавил метку для отличия функционала. Проверю и уберу к следующей сборке.

* Мелкие правки

* From additional improvements.

* hmmm

* hm

* 123

* Небольшие правки "КАК СОЗДАТЬ СЕРВЕР С ДРУГОМ Update"

* Рефакторинг и добавление новых строк с 1 по 136

- Приведение положения строк в бандле в соответствии с референсным файлом
- Добавление и перевод новых (отсутствующих) строк из референсного файла

* Рефакторинг и добавление новых строк с 137 по 380

- Приведение положения строк в бандле в соответствии с референсным файлом
- Добавление и перевод новых (отсутствующих) строк из референсного файла
- Мелкие правки

* Second pack of changes by Vanguard.

* ru_ri

* Небольшие правки

* 313131

* Рефакторинг, корректировка и добавление новых строк с 381 по 600

Рефакторинг, корректировка и добавление новых строк с 381 по 600
- Приведение положения строк в бандле в соответствии с референсным файлом
- Добавление и перевод новых (отсутствующих) строк из референсного файла
- Корректировка существующих строк

* Перші сто рядків українського перекладу відредаговано.

* 121

* 212122

* правки в редакторе

* ещё правки в редакторе

* мелкие правки

* правка

* Рефакторинг, корректировка и добавление новых строк с 601 по 800

Рефакторинг, корректировка и добавление новых строк с 601 по 800
- Приведение положения строк в бандле в соответствии с референсным файлом
- Добавление и перевод новых (отсутствующих) строк из референсного файла
- Корректировка существующих строк

* Рефакторинг, корректировка и добавление новых строк с 801 по 912

Рефакторинг, корректировка и добавление новых строк с 801 по 912
- Приведение положения строк в бандле в соответствии с референсным файлом
- Добавление и перевод новых (отсутствующих) строк из референсного файла
- Корректировка существующих строк

* мелкие правки

* Виправив декілька помилок

* 3123

* Мелкие правки и дополнения

* Перевод новых строк

* niiiice

* oh no

* oh no 😱

* 😱 oh no 😱

* just another yet translator

* Some contributors

The changes made by **Vanguard** were commited by @Prosta4okua and @Remint32 (Felix
Corvus).
Therefore he is not present in authors of commits on github.

* Мелкие правки из TODO

* Новые строки и новые правки

DAFAK?
-> 3f293190cf (diff-daade3141498d8856d75ec34b88bbb19)

* Добавление строк блока с сообщением

* Корректировка правок

* Правки правок

* Правки 🚚

* Крамниця

* Правки и удаление "точки сбора"

rally point ?!?!

* Steam Russian localisation files

* Tiny fix https://github.com/Anuken/Mindustry/issues/661

* Мелкие правки

* Мелкие правки из TODO

* Правки от Vanguard

Правки от @XEN0PHIL

* 🤔

( ͡° ͜ʖ ͡°)

* RU translation changes from Vanguard (#9)

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* ЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇ

* Update bundle.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_uk_UA.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Fixed the mess between codes like {0} {1} etc.

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* 1 new line added

mod.requiresversion

* 1 new line, 1 changed line

New:
settings.resetKey

Changed:
mech.dart-ship.description

* 1 new line added

item.corestorable

* byte-logic draft translations

Зная скорость Анюка

* 1 new line, 1 changed line

New:
mod.item.remove

Changed:
mode.attack.description
2019-12-07 17:39:35 -05:00
Anuken
5ca01bf234 Effect parsing 2019-12-07 15:55:51 -05:00
Anuken
d3747f0d4c Content loading improvements 2019-12-07 15:41:52 -05:00
Patrick 'Quezler' Mounier
d81b36d897 Add 1 plastanium to armored conduits recipe (#1181) 2019-12-07 15:25:37 -05:00
Anuken
07598e3f2f Minor tweaks 2019-12-07 14:26:14 -05:00
Anuken
dd5e3b2aba JS console / Scripting tweaks 2019-12-07 14:10:39 -05:00
Anuken
06abc43aea Fixed slow imports 2019-12-07 11:37:13 -05:00
Patrick 'Quezler' Mounier
8b80a42886 Respect insulated blocks when toggeling a powernode (#1163) 2019-12-07 11:10:59 -05:00
Anuken
93fd6c5bd6 Removed massive import wall 2019-12-07 01:51:09 -05:00
Anuken
96aa3ccee0 Various improvements 2019-12-07 00:34:27 -05:00
Anuken
f3a5798a7f Various fixes 2019-12-06 22:24:32 -05:00
Anuken
2b49c300f8 Security / Android compat / Functional extension 2019-12-06 21:57:47 -05:00
Anuken
50a6071cfc Fixed maps not reloading on mod reload 2019-12-06 14:07:18 -05:00
Vanguard
044dac6a9e
Merge branch 'master' into master 2019-12-06 18:20:05 +03:00
Vanguard
7f3f27a91e
1 new line, 1 changed line
New:
mod.item.remove

Changed:
mode.attack.description
2019-12-06 18:00:20 +03:00
Anuken
ef24e5ecad Merge remote-tracking branch 'origin/master' 2019-12-05 22:06:57 -05:00
Anuken
6f146c6cad Added support for mod map/schematic packs 2019-12-05 21:15:28 -05:00
Ali-C-Ila
db5bd7eea8 Update bundle.properties (#1164) 2019-12-05 10:01:47 -05:00
iczero
2e315e5516 Fix builderID remaining -1 for Call.onDeconstructFinish (#1162)
BuildEntity.deconstruct is missing code to set builderID,
so the builderID parameter is always set to -1 in
Call.onDeconstructFinish. The same code exists in
BuildEntity.construct.
2019-12-04 21:54:50 -05:00
Anuken
a087df0771 Added experimental server block syncing 2019-12-04 17:03:49 -05:00
itskatt
ba982a73b8
Remove e
Co-Authored-By: Paulao17 <paul@shimaore.net>
2019-12-04 19:59:51 +01:00
Anuken
c85847567d h 2019-12-03 18:03:21 -05:00
Martin Gebert
c08aa1f3d6 add and fix some German translations 2019-12-03 23:16:58 +01:00
Anuken
1e3bfba31a this engine is also broken 2019-12-03 17:16:23 -05:00
Anuken
5788c27aaa hmmm 2019-12-03 01:01:18 -05:00
Anuken
5c30f4bc9c Fixed nothing 2019-12-02 17:52:49 -05:00
Anuken
5a9957c578 Merge remote-tracking branch 'origin/master' 2019-12-01 17:36:30 -05:00
Anuken
42687fb47e Fixed crash caused by missing sounds 2019-12-01 17:35:47 -05:00
Anuken
9cb55b9745 a mess 2019-12-01 14:21:47 -05:00
itskatt
04d3c40baa
Apply suggestions from review
Co-Authored-By: YaFou <33806646+YaFou@users.noreply.github.com>
2019-12-01 18:36:25 +01:00
Anuken
0e7c403bd8 Tweaks 2019-12-01 12:32:35 -05:00
itskatt
77e0e46a17 Update the French Translation 2019-12-01 16:52:39 +01:00
Anuken
b6915a0483 Fixed script load crash 2019-12-01 01:30:40 -05:00
Ali-C-Ila
ae981053b2 Update bundle_zh_TW.properties (#1133)
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
2019-12-01 00:10:51 -05:00
PlayerBrasil13
23f90fcaf4 Update bundle_pt_BR.properties (#1128)
Translated the last PR's added lines, fixed some portuguese errors.
2019-12-01 00:08:40 -05:00
Prosta4okua
765d9703f5 Ukrainian translation (#1144)
* :flag_ua:

* 🇺🇦

* ЇїЇ

* 30.10.2019

* Упс.

* 1

* 06.11.2019

* lol

* 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

* 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
2019-12-01 00:04:35 -05:00
Anuken
ceae04aa5b Desktop-specific scripting 2019-11-30 18:30:39 -05:00
Anuken
3abcdf2063 Better access 2019-11-30 17:45:02 -05:00
Anuken
f784e893dd Merge remote-tracking branch 'origin/master' 2019-11-29 22:17:45 -05:00
Anuken
7e993c15dc Moved documentation 2019-11-29 21:56:53 -05:00
valtsu41
5411ae777e Starting bundle_fi.properties (#900) 2019-11-28 22:04:58 -05:00
Anuken
57f9aeee86 Public block fields / Better scripting 2019-11-27 13:51:07 -05:00
Anuken
eabbd2fa32 """security""" 2019-11-27 00:07:37 -05:00
Anuken
d9aa9b6278 Desktop scripting support 2019-11-26 23:32:30 -05:00
Anuken
1e1b84a201 Merge branches 'master' and 'mod-spritepack-refactor' of https://github.com/Anuken/Mindustry 2019-11-25 23:55:18 -05:00
Anuken
e6753ace87 Cleanup 2019-11-25 23:43:58 -05:00
Felix Corvus
932c32ad8f
byte-logic draft translations
Зная скорость Анюка
2019-11-26 06:40:59 +03:00
Anuken
a5fbc07561 Texture overrides / Potential mod texture binding optimizations 2019-11-25 20:50:32 -05:00
Felix Corvus
2631c4f7af adding millions & thousands localisation (#1132)
* "mil" / "k" localisation adding

* "mil" / "k" localisation adding

* Update bundle.properties

* Update bundle_ru.properties
2019-11-25 20:48:53 -05:00
Anuken
01304bf734 Fixed bizzare crash 2019-11-25 18:41:09 -05:00
Ali-C-Ila
c2c5836752 Update bundle_zh_TW.properties (#1131) 2019-11-25 14:48:24 -05:00
Vanguard
6a15328854
1 new line added
item.corestorable
2019-11-25 16:42:40 +03:00
matheod
dabdd094f9 Add storable indication in core database (#1124)
* Add storable in core indication in core database

* Add corestorable text

* French translation of corestorable
2019-11-24 01:35:16 -05:00
PlayerBrasil13
6f48e7a5ed Update bundle_pt_BR.properties (#1122)
Added some lines that are in bundle.properties and was missing in bundle_pt_BR.properties
2019-11-23 20:43:00 -05:00
Ali-C-Ila
98bca1740c Update bundle_zh_TW.properties (#1118)
* 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
2019-11-23 15:16:49 -05:00
CinExPL
51842a61a8 Update bundle_pl.properties (#1119)
Improvements based on comparison with original bundle file + small fixes
2019-11-23 15:16:32 -05:00
Anuken
78fefdacca Merge remote-tracking branch 'origin/master' 2019-11-22 23:12:44 -05:00
Anuken
a1fb3e27ab Fixed launched items not saving 2019-11-22 23:10:50 -05:00
YFdyh000
686b892ea9 Update bundle_zh_CN.properties (#1113)
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
2019-11-22 21:00:11 -05:00
osoitz
ffcfaf1610 Update bundle_eu.properties (#1114) 2019-11-22 20:59:42 -05:00
blackassasin1234
80c46bb5a2 Added some Events (#1096)
* Added PlayerBanEvent, PlayerUnbanEvent, PlayerIpBanEvent, and PlayerIpUnbanEvent.

* Removed Unecessary import (oops)

* Formatted code

* Fixed a little oopsie

* Prevent NPE

* add another line..
2019-11-22 20:56:00 -05:00
Anuken
cb29bee8f5 Remove js mod ext support 2019-11-22 18:42:10 -05:00
Anuken
2d42704062 Switched to hjson extension 2019-11-22 18:19:18 -05:00
Vanguard
2136ae03a5
1 new line, 1 changed line
New:
settings.resetKey

Changed:
mech.dart-ship.description
2019-11-23 02:18:58 +03:00
Anuken
fbe58bec04 Merge remote-tracking branch 'origin/master' 2019-11-22 17:54:25 -05:00
Anuken
5f81a0c7f3 Bugfixes 2019-11-22 17:51:29 -05:00
DeltaNedas
38804462a9 add reset keybind to english locale (#1116)
* updated english locale for "reset key".

* Update bundle.properties

* Update bundle.properties
2019-11-22 16:17:11 -05:00
Anuken
f28eb4027c Log # of fetched servers; cleanup 2019-11-22 16:13:09 -05:00
Anuken
c324dce034 Added potential global server list 2019-11-22 16:00:53 -05:00
Anuken
6d6fac00d7 Less hacky support for atrocious json 2019-11-22 15:33:01 -05:00
Vanguard
d0803ef45c
1 new line added
mod.requiresversion
2019-11-22 17:07:04 +03:00
Anuken
2c61fcdfa6 Added optional mod minimum game version 2019-11-21 21:12:05 -05:00
Anuken
18b6c37a89 Item bridge fixes 2019-11-21 20:50:15 -05:00