10384 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Anuken	bc55e43def	Fixed #3591	2020-11-25 11:15:46 -05:00
Anuken	084d7e8355	Merge pull request #3583 from Quezler/patch-69 ... automatic reconnect	2020-11-25 11:14:04 -05:00
Anuken	22e60612ac	Merge remote-tracking branch 'origin/master'	2020-11-25 11:09:33 -05:00
Anuken	b271c4be32	Fixed deploy CI, again	2020-11-25 11:09:29 -05:00
Patrick 'Quezler' Mounier	f26b3358ef	Update core/src/mindustry/ui/dialogs/JoinDialog.java ... Co-authored-by: Anuken <arnukren@gmail.com>	2020-11-25 17:08:03 +01:00
Patrick 'Quezler' Mounier	3d6390a76a	Set the ping to null when canceling manually as well	2020-11-25 16:51:57 +01:00
Patrick 'Quezler' Mounier	ff20928bec	Anukify reconnect logic	2020-11-25 16:49:36 +01:00
Anuken	59387389a4	Merge pull request #3563 from skykatik/patch-11 ... Deleted unnecessary DateTimeFormatter declaration	2020-11-25 10:33:46 -05:00
Anuken	fb200c6d11	arc	2020-11-25 10:16:40 -05:00
Anuken	8418770bbf	Merge remote-tracking branch 'origin/master'	2020-11-25 10:15:22 -05:00
Anuken	eaa7b04c3d	Fixed CI / Fixed exponentially increasing broken blocks	2020-11-25 10:15:14 -05:00
Anuken	6131ef23fc	Merge pull request #3578 from Quezler/patch-67 ... Remove unused import	2020-11-25 09:36:41 -05:00
Angel_24	1467a3a7fd	Update bundle_es.properties	2020-11-25 14:59:07 +01:00
EzLam	f5023aa846	Update bundle_vi.properties	2020-11-25 19:22:28 +07:00
EzLam	d10fd8e738	fix typos.	2020-11-25 17:46:38 +07:00
lapis256	8ca833f753	update bundle_ja.properties	2020-11-25 18:50:44 +09:00
Patrick 'Quezler' Mounier	b002d8b446	Update bundle.properties	2020-11-25 10:42:13 +01:00
Patrick 'Quezler' Mounier	f5e06cca54	Update NetClient.java	2020-11-25 10:41:41 +01:00
Patrick 'Quezler' Mounier	642b877ab0	Update JoinDialog.java	2020-11-25 10:40:42 +01:00
Angel_24	2a618a6600	Update bundle_es.properties	2020-11-25 10:36:48 +01:00
Angel_24	fa48f1b2e0	Merge branch 'master' into patch-2	2020-11-25 10:26:11 +01:00
Angel_24	69063e9dc5	Update contributors	2020-11-25 10:23:07 +01:00
NgLamVN	c2bedc0210	Update	2020-11-25 16:09:41 +07:00
EzLam	103f5a65b6	LOL I forgot to do that :v	2020-11-25 15:42:30 +07:00
YellOw139	e0f2c2f46f	Sector descriptions: additions and revisions ... Romanian is gonna hit stable soon.	2020-11-25 10:40:02 +02:00
Patrick 'Quezler' Mounier	8ee3f2b2e6	Remove stray newline	2020-11-25 09:38:04 +01:00
EzLam	7697a21003	...	2020-11-25 15:36:45 +07:00
Patrick 'Quezler' Mounier	40bf0741f0	Remove unused import	2020-11-25 09:36:12 +01:00
Thomas Widyantoko	d13c407846	Merge pull request #11 from Quick-korkc/patch-12 ... New hint translate and other	2020-11-25 15:33:37 +07:00
Quick-Korc	43fea03996	New hint translate and other	2020-11-25 15:24:35 +07:00
Nikolass1000	87da58df69	Update bundle_pl.properties	2020-11-25 09:19:35 +01:00
EzLam	72a453654e	...	2020-11-25 14:56:15 +07:00
EzLam	25c31c5250	Update to lastest main bundle.	2020-11-25 14:30:53 +07:00
Thomas Widyantoko	fac1bccda1	various fixes	2020-11-25 14:16:00 +07:00
Thomas Widyantoko	2f465493f0	Merge pull request from Quick-korkc ... New Sector description Translation	2020-11-25 13:56:01 +07:00
Anuken	6633b07fb2	Merge pull request #3561 from Volas171/patch-2 ... Update contributors	2020-11-24 18:55:00 -05:00
Quick-Korc	b285165818	New Sector description Translation	2020-11-25 06:31:16 +07:00
Volas171	e65971db47	h	2020-11-24 18:30:59 -05:00
Anuken	5fd66d38bb	Fixed #3573	2020-11-24 18:15:40 -05:00
Anuken	15f33b45c7	Salt Flats should probably require additive reconstructors	2020-11-24 18:12:45 -05:00
Anuken	17e66f1008	Final campaign tweaks	2020-11-24 17:17:55 -05:00
Anuken	bcaf5e4c3d	Campaign balance / Smarter power node placement	2020-11-24 16:33:36 -05:00
YellOw139	ea653bf5c3	Finished (for now)	2020-11-24 20:48:40 +02:00
Anuken	6fd36d97f0	Balancing	2020-11-24 12:53:55 -05:00
Anuken	61bec243dc	Campaign balance	2020-11-24 12:35:04 -05:00
Anuken	7d43856735	Bugfixes	2020-11-24 10:23:28 -05:00
CPXMC	9f8e1b93f1	Update bundle_zh_CN.properties ... 单位，方块，物品的简介翻译交给你们了（滑稽	2020-11-24 22:02:28 +08:00
Anuken	058b2ddfce	Fixed #3565	2020-11-24 09:00:34 -05:00
YellOw139	7a59c7bc24	translation checkpoint	2020-11-24 13:22:42 +02:00
Skat	1637360952	Deleted unnecessary DateTimeFormatter declaration	2020-11-24 13:00:08 +03:00