mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-03 13:30:25 +07:00
Code Issues Packages Projects Releases Wiki Activity
16,349 Commits 4 Branches 160 Tags 2.1 GiB
new-liquid-graph
Commit Graph

13799 Commits

Author SHA1 Message Date
Anuken
3ea742b06d debugGraphs off 2023-05-09 15:39:53 -04:00
Anuken
9bedadac79 Better conduit merge 2023-05-09 15:34:13 -04:00
Anuken
5ccadcf38f Semi-functioning implementation 2023-05-09 15:00:26 -04:00
Anuken
a32462971b checklist 2023-05-09 12:23:49 -04:00
Anuken
3faf8ca07f WIP conduit graph 2023-05-09 12:19:26 -04:00
Anuken
ccd2727ab5 Merge remote-tracking branch 'origin/master' 2023-05-08 12:15:06 -04:00
Anuken
820fd0d7fc Canvas block schematic preview 2023-05-08 12:15:00 -04:00
Anuken
a4972886a3 Possible parser status effect fix 2023-05-08 09:50:33 -04:00
Github Actions
db0691f32f Automatic bundle update 2023-05-07 16:33:03 +00:00
Mario A
a36e31c4b4
Fix some Italian translations (#8564) 
Co-authored-by: Midblyte <midblyte@anonaddy.me>
 2023-05-07 12:32:10 -04:00
JniTrRny
23f1d24c45
Search bar for wave UI (#8501) 
* wave search + other editor things

* everything but wave search
 2023-05-07 10:42:45 -04:00
Github Actions
2b5ff56460 Automatic bundle update 2023-05-07 13:39:11 +00:00
nullevoy
dbafdfb312
gas sprites (ark too ig) (#8528) 
* ?

* this was better

* ghghghghgghghhghghghg

* single pixel changes
 2023-05-07 09:38:17 -04:00
JniTrRny
bb06c3f1e9
Wave limit game rule in custom maps (#8550) 
* custom maps wave limit

* whoopsies
 2023-05-06 23:04:31 -04:00
Anuken
72c67f6c9b Merge remote-tracking branch 'origin/master' 2023-05-06 21:57:00 -04:00
Anuken
ea27fa53bf unitHealth in logic 2023-05-06 21:56:56 -04:00
Github Actions
8bbd58053a Automatic bundle update 2023-05-07 01:53:52 +00:00
Philipp
f1b52164c9
Fix some mistakes in German translation (#8543) 
* Fix typo in German tutorial

* Fix some more
 2023-05-06 21:53:10 -04:00
Prosta4okua
6cfcffd04e
New translation (#8555) 
* Update bundle_uk_UA.properties

Old

* Messaged

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

---------

Co-authored-by: SUS <94375206+1stvaliduser@users.noreply.github.com>
 2023-05-06 21:52:52 -04:00
Даркнесс#3729
f581aa3332
Update russian bundle (#8559) 
* Update russian bundle

* Update bundle_ru.properties
 2023-05-06 21:51:51 -04:00
Catchears
8126e970f3
update german translation (#8560) 
* update german translation

* resolve @Shawak's comment
 2023-05-06 21:51:37 -04:00
Slotterleet
52ec9f4296
A couple of features for better planet modding (#8558) 
* Planet item whitelist

* allowLaunchToNumbered for planets

* Update core/src/mindustry/type/Planet.java

* Update core/src/mindustry/type/Planet.java

---------

Co-authored-by: Anuken <arnukren@gmail.com>
 2023-05-06 21:49:40 -04:00
MEEPofFaith
cc17962d93
Clear invalid payload ammo (#8544) 2023-05-06 21:34:11 -04:00
BalaM314
c1d3cdc5cb
Fix override of Building.block in PayloadSource (#8551) 
* Would break(without crash) mods that read the block config of PayloadSource
 2023-05-06 21:31:02 -04:00
Anuken
d85995f6fd Fixed #8557 2023-05-06 21:27:45 -04:00
Anuken
bc622bd7ba Doubled max schematic size 2023-05-06 11:11:57 -04:00
Anuken
027b996ad6 Fixed power node linking in basegen 2023-05-05 23:46:21 -04:00
Anuken
0bed338141 Fixed invalid ranges for some weapons 2023-05-05 23:40:05 -04:00
Anuken
43922edac8 unitHealthMultiplier re-implemented 2023-05-03 18:38:50 -04:00
Joan Josep
c4e1719c0c
Update bundle_ca.properties (#8542) 2023-04-29 09:03:51 -04:00
Anuken
6f88684040 and these other weapons too 2023-04-28 15:17:05 -04:00
Anuken
5e8f5f1d62 PointDefenseWeapon no longer affects range 2023-04-28 14:39:28 -04:00
Anuken
681bd19866 Merge remote-tracking branch 'origin/master' 2023-04-28 10:48:21 -04:00
Anuken
8eed0f8711 Fixed #8533 2023-04-28 10:48:17 -04:00
MEEPofFaith
61a83d0f6e
warmup and totalProgress for Pumps (#8536) 2023-04-28 10:42:31 -04:00
Github Actions
fc23ad9910 Automatic bundle update 2023-04-28 14:41:51 +00:00
JniTrRny
eba58c73e6
Update bundle_th.properties (#8532) 
* 6 months of doing nothing

* Why am I up there

* More ✨lore✨ to the descriptions

* RIP original item description

* revenge of the item details

* new vocabulary just dropped

* cancel transliteration

sounds kinda lame, so might revert it later.
 2023-04-28 10:40:32 -04:00
Anuken
7de6bd23ea Fixed #8529 2023-04-28 10:29:47 -04:00
Anuken
102d234129 Merge remote-tracking branch 'origin/master' 2023-04-24 23:59:51 -04:00
Anuken
583a1c69b6 Logic pathfind instruction 2023-04-24 23:59:46 -04:00
MEEPofFaith
1314dfe53e
Don't set lighting if the preset has noLighting = true (#8519) 
* Don't set lighting if the preset has noLighting = true

Allows lighting in the preset or world processors to take over instead of being forced to disable lighting.

* Less confusing style
 2023-04-21 21:56:16 -04:00
Anuken
05f158fd51 Fixed #8523 2023-04-21 21:29:39 -04:00
Anuken
13297023fe Fixed #8525 2023-04-21 21:24:18 -04:00
Anuken
9cc392a9ed Merge remote-tracking branch 'origin/master' 2023-04-21 11:44:05 -04:00
Anuken
eb1d0b8362 Fixed minimap update lag 2023-04-21 11:44:00 -04:00
Anuken
7a01be6dba splashDamagePierce 2023-04-20 01:03:18 -04:00
MEEPofFaith
6a3b243937
Erekir payload conveyor sprite consistency (#8506) 
* Erekir payload conveyor sprite consistency

* Better blending from conveyor to factory

* Better blending for the 5x5
 2023-04-18 16:37:34 -04:00
MEEPofFaith
b2f5312bf5
Add overlays to render updates (#8514) 2023-04-18 10:14:07 -04:00
Anuken
6a3638c3c2 Fixed #8513 2023-04-18 10:10:11 -04:00
Anuken
3ca3eb5951 Load saves in parallel 2023-04-18 09:35:29 -04:00