Commit Graph

9545 Commits

Author SHA1 Message Date
Anuken
b801093597 Merge remote-tracking branch 'origin/master' 2020-10-25 11:22:19 -04:00
Anuken
81dae580a4 Bugfixes / Removed tile unit multi-mining 2020-10-25 11:22:10 -04:00
YellOw139
1d54e939cb Add new font.woff 2020-10-25 17:02:04 +02:00
YellOw139
a40c49a915 Delete font.woff 2020-10-25 17:01:29 +02:00
Anuken
03f58a1b02 Merge pull request #2972 from sk7725/patch-20
Add colors to StatusEffects
2020-10-25 10:35:42 -04:00
YellOw139
103e408cb7 [Bundle][RO] Translation Update
This PR was tested in-game and is ready to merge at any time (unless marked as draft).

Changelog:

- New strings/changes up to commit 41d388aa7f
- Typo fixes & various other improvements
2020-10-25 15:45:57 +02:00
Anuken
b2b0082c7d Fixed #3108 / Fixed #3112 2020-10-25 09:23:13 -04:00
Wiki Updater
1d4da170ef änderungen von shawak 2020-10-25 14:22:36 +01:00
老滑稽
3b75527e4c Update bundle_zh_CN.properties 2020-10-25 19:24:57 +08:00
老滑稽
83d4825bf2 Update bundle_zh_CN.properties 2020-10-25 18:57:57 +08:00
Prosta4okua
3d47389a39 Update bundle_uk_UA.properties 2020-10-25 11:19:09 +02:00
MEEP of Faith
2c03516998 I thought this failed. I guess not.. 2020-10-24 17:27:01 -07:00
MEEP of Faith
062b319ab3 ok, then try this? 2020-10-24 17:16:56 -07:00
MEEP of Faith
8ad4349d18 test this 2020-10-24 17:12:44 -07:00
Anuken
1d85495f7a Merge remote-tracking branch 'origin/master' 2020-10-24 19:06:09 -04:00
Anuken
41d388aa7f Item sprite cleanup 2020-10-24 19:06:05 -04:00
MEEP of Faith
2ec3eee138 Custom Base Support 2020-10-24 15:02:36 -07:00
Anuken
e88921c77e Merge pull request #3100 from MEEPofFaith/patch-1
"diable"
2020-10-24 16:56:49 -04:00
MEEP of Faith
705728f16a "diable"
oh no
2020-10-24 13:49:30 -07:00
Skat
6b94cbd089 Oh 2020-10-24 23:44:16 +03:00
Skat
7b8a9ff15e Update ChatFragment.java
This will avoid exceeding the message length limit if player send a message with spaces in end/start message
2020-10-24 23:34:18 +03:00
azureblue
a7c24d4bfd fixing formatting 2020-10-24 22:10:02 +02:00
Anuken
79ace277ed Merge remote-tracking branch 'origin/master' 2020-10-24 15:55:25 -04:00
Anuken
bc035f9490 Fixed #3095 2020-10-24 15:55:20 -04:00
azureblue
73a5af2e5e make ending direction follow the path 2020-10-24 21:34:47 +02:00
Anuken
ee7bdbf44e Merge pull request #3081 from genNAowl/standardize-liquid-stats
Remove timePeriod in LiquidBaseValue
2020-10-24 15:18:47 -04:00
Anuken
b611726c3e Merge remote-tracking branch 'origin/master' 2020-10-24 15:11:31 -04:00
Anuken
819686e812 Unit factory production list 2020-10-24 15:11:27 -04:00
Anuken
94e40a32b9 Merge pull request #3093 from DeltaNedas/patch-11
add more info to print object
2020-10-24 15:09:50 -04:00
DeltaNedas
3b2669fa21 pattern variables? 2020-10-24 17:23:54 +00:00
DeltaNedas
801ff1701e silly 2020-10-24 17:19:50 +00:00
Vanguard
b4deb6caca 1 line changed
unit.nobuild
2020-10-24 20:06:02 +03:00
DeltaNedas
364a2b43c2 add Content fallback 2020-10-24 17:04:58 +00:00
DeltaNedas
279d898d68 add more info to print object 2020-10-24 16:37:55 +00:00
Felix Corvus
ba7645e531 Update bundle_ru.properties 2020-10-24 19:14:18 +03:00
Anuken
a930b34c3e Merge pull request #3090 from QmelZ/master
Turkish Translation
2020-10-24 11:58:21 -04:00
QmelZ
232a3dfe87 one last little fix 2020-10-24 17:28:10 +03:00
Anuken
ddbca62f92 Merge remote-tracking branch 'origin/master' 2020-10-24 10:22:04 -04:00
Anuken
646b022d38 Bugfixes 2020-10-24 10:21:57 -04:00
QmelZ
19ef414e5c even more fixes 2020-10-24 17:18:56 +03:00
QmelZ
f46eb24615 some other fixes 2020-10-24 17:07:52 +03:00
Anuken
4e6faf3bac Merge pull request #3083 from genNAowl/titanium-ammo-fuse
Switch places of titanium and thorium ammo in `Blocks.java`
2020-10-24 09:47:21 -04:00
Anuken
48f5007306 Merge pull request #2990 from driver1748/patch-5
Update bundle_zh_CN.properties
2020-10-24 09:46:09 -04:00
Anuken
56acbcecfd Merge branch 'master' into patch-5 2020-10-24 09:46:02 -04:00
QmelZ
7d0952d858 small fix 2020-10-24 15:59:28 +03:00
QmelZ
ef40a2e78e Update bundle_tr.properties 2020-10-24 15:56:51 +03:00
Wiki Updater
280f0d6e21 Improve german translation for v6 2020-10-24 09:20:57 +02:00
QmelZ
b4abd3b23d Merge pull request #1 from SilentOwl476/patch-1
Update bundle_tr.properties
2020-10-24 09:10:32 +03:00
Leonwang4234
f2a984f3e7 Lets hope this compiles because I don't have time to test it 2020-10-23 19:53:21 -07:00
Anuken
1ffa3f21f0 (2) 2020-10-23 20:41:32 -04:00