Patrick 'Quezler' Mounier
|
99d1a2829f
|
Merge branch 'master' into crater
|
2020-02-06 19:33:57 +01:00 |
|
Anuken
|
a5fd881f8d
|
Full implementation of #1494
|
2020-02-05 19:01:53 -05:00 |
|
Patrick 'Quezler' Mounier
|
05ccdfd51b
|
Merge branch 'master' into crater
# 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/world/modules/ItemModule.java
|
2020-02-05 10:26:34 +01:00 |
|
Anuken
|
2721aa550d
|
Implemented #1444
|
2020-01-30 22:56:17 -05:00 |
|
Patrick 'Quezler' Mounier
|
8edcebd3a6
|
Undo moving other bundle keys into their place
Should be a different commit/pull
|
2020-01-27 19:42:27 +01:00 |
|
Patrick 'Quezler' Mounier
|
58a79d8631
|
Update to v103
# 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/content/Blocks.java
# core/src/mindustry/content/TechTree.java
# core/src/mindustry/world/blocks/distribution/ItemConveyor.java
|
2020-01-24 20:25:03 +01:00 |
|
Anuken
|
63c277f78e
|
Implemented mod name display in content desc
|
2020-01-24 10:26:10 -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
|
26676d60e1
|
Added underflow gates
|
2020-01-20 18:54:25 -05:00 |
|
Anuken
|
c3d2351b2d
|
Various icon changes
|
2020-01-17 13:57:04 -05:00 |
|
Anuken
|
ce18e32826
|
Added font icon generate+merge pipeline
|
2020-01-16 17:05:20 -05:00 |
|
Anuken
|
3eaeac3618
|
Testing icon font
|
2020-01-16 11:10:53 -05:00 |
|
Anuken
|
7e7d2019af
|
Made Android files external
|
2020-01-11 19:21:16 -05:00 |
|
Patrick 'Quezler' Mounier
|
ed765ad10a
|
Merge branch 'master' into crater
# 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
|
2020-01-10 12:02:07 +01:00 |
|
J-VdS
|
9b82333a69
|
typo (#1343)
|
2020-01-08 17:36:58 -05:00 |
|
Anuken
|
a7cddf97b8
|
Implemented bridge opacity from #1006
|
2020-01-08 16:16:19 -05:00 |
|
Anuken
|
8f208920f7
|
Merged in liquid void
|
2020-01-08 11:04:12 -05:00 |
|
Patrick 'Quezler' Mounier
|
9b55eeaa38
|
Rename batches to something simpler
|
2020-01-06 18:04:56 +01:00 |
|
Patrick 'Quezler' Mounier
|
1a177ef239
|
Rephase dotted
|
2020-01-06 18:00:43 +01:00 |
|
Patrick 'Quezler' Mounier
|
207d95dbd8
|
Refractor away throughput stat
|
2020-01-06 17:57:14 +01:00 |
|
Patrick 'Quezler' Mounier
|
c6299c8f2c
|
Add throughput stat entry
|
2020-01-05 15:28:28 +01:00 |
|
Patrick 'Quezler' Mounier
|
095c65f36c
|
Remove crater from bundle
|
2020-01-04 21:10:09 +01:00 |
|
Patrick 'Quezler' Mounier
|
e2d0ab5161
|
Move bundle entries around
|
2020-01-03 17:42:05 +01:00 |
|
Patrick 'Quezler' Mounier
|
73040de839
|
Change bundle description
|
2020-01-03 17:41:05 +01:00 |
|
Patrick 'Quezler' Mounier
|
f0bfe24008
|
Remove crater bundle entry
|
2020-01-02 21:34:56 +01:00 |
|
Patrick 'Quezler' Mounier
|
1bcfc69206
|
Tweak stat pages
|
2020-01-01 14:01:54 +01:00 |
|
Patrick 'Quezler' Mounier
|
c3186b63ce
|
Rename compression to plastanium
Breaking change.
|
2020-01-01 13:43:14 +01:00 |
|
Patrick 'Quezler' Mounier
|
20a511d940
|
Merge branch 'master' into crater
|
2019-12-29 20:50:55 +01:00 |
|
Anuken
|
6edcbb9120
|
Bugfixes
|
2019-12-29 14:38:03 -05:00 |
|
Patrick 'Quezler' Mounier
|
326f75cbda
|
Merge branch 'master' into crater
|
2019-12-29 19:09:27 +01:00 |
|
Anuken
|
730d30ef98
|
Added core schematic selection setting
|
2019-12-29 11:40:52 -05:00 |
|
Anuken
|
8c941c7165
|
Added update trigger / Server moddability tweaks
|
2019-12-28 21:34:20 -05:00 |
|
Anuken
|
e1bf8bdab1
|
Added BE auto-updater / Server config / Fixed #1266
|
2019-12-28 16:30:40 -05:00 |
|
Patrick 'Quezler' Mounier
|
e0cfbc7609
|
All hail the cuteness of this crater roomba critter
|
2019-12-27 20:45:27 +01:00 |
|
Anuken
|
ede002878e
|
problem solved
|
2019-12-21 21:11:30 -08:00 |
|
ado1928
|
5e568eac0d
|
Added Feathub to the "About" tab (#1234)
* Add files via upload
* Add files via upload
* Add files via upload
* Add files via upload
* Update Links.java
|
2019-12-19 19:33:24 -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
|
58e3143e2a
|
Content cleaning
|
2019-12-14 09:33:07 -05:00 |
|
TsjipTsjip
|
7f5e494709
|
Update bundle.properties
|
2019-12-13 14:52:15 +01:00 |
|
joshuaptfan
|
736737f151
|
Make scroll zoom by default, remove zoom hold keybind
|
2019-12-12 12:23:32 -08:00 |
|
Anuken
|
0078a8cb8e
|
Fixed scripts not working on older Android phones
|
2019-12-09 12:48:15 -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
|
2b49c300f8
|
Security / Android compat / Functional extension
|
2019-12-06 21:57:47 -05: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 |
|
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 |
|
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 |
|