Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,836 Commits 4 Branches 180 Tags
68d51c1770327d54b4a7f13d675bf48a38146ef2
Commit Graph
16836 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Github Actions 2b5ff56460 Automatic bundle update 2023-05-07 13:39:11 +00:00
nullevoyandGitHub dbafdfb312 gas sprites (ark too ig) (#8528) 
* ?

* this was better

* ghghghghgghghhghghghg

* single pixel changes
 2023-05-07 09:38:17 -04:00
JniTrRnyandGitHub 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
PhilippandGitHub f1b52164c9 Fix some mistakes in German translation (#8543) 
* Fix typo in German tutorial

* Fix some more
 2023-05-06 21:53:10 -04:00
Prosta4okuaGitHubSUS
 		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
HamzaGSoppGitHubAnuken
 		ddd77b2081 Update servers_v7.json (#8556) 
* Update servers_v7.json

chabge adresse of tamazia

* Update servers_v7.json

---------

Co-authored-by: Anuken <arnukren@gmail.com>
 2023-05-06 21:52:38 -04:00
Даркнесс#3729andGitHub f581aa3332 Update russian bundle (#8559) 
* Update russian bundle

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

* resolve @Shawak's comment
 2023-05-06 21:51:37 -04:00
SlotterleetGitHubAnuken
 		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
MEEPofFaithandGitHub cc17962d93 Clear invalid payload ammo (#8544) 2023-05-06 21:34:11 -04:00
BalaM314andGitHub 6c7d506e42 Gradle opt -PnoLocalArc to force no localArc (#8552) 
renaming Arc is annoying, also vscode doesnt like it
 2023-05-06 21:33:45 -04:00
BalaM314andGitHub 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 JosepandGitHub c4e1719c0c Update bundle_ca.properties (#8542) 2023-04-29 09:03:51 -04:00
Anuken 4deddc6def tests are no longer stupid 2023-04-28 15:37:38 -04:00
Anuken 6f88684040 and these other weapons too 2023-04-28 15:17:05 -04:00
Anuken 1a83d35923 Merge remote-tracking branch 'origin/master' 2023-04-28 14:39:34 -04:00
Anuken 5e8f5f1d62 PointDefenseWeapon no longer affects range 2023-04-28 14:39:28 -04:00
OSPandGitHub d610cd6105 [XCore] Mini Attack server + reserve server (#8530) 2023-04-28 10:55:11 -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
MEEPofFaithandGitHub 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
JniTrRnyandGitHub 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
TomokoandGitHub ba0335e5ef new ip (#8534) 
* new ip

* Update servers_v7.json
 2023-04-28 10:39:35 -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
MEEPofFaithandGitHub 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
ienovandGitHub abc80b9aab update easyplay servers (#8521) 2023-04-21 21:32:46 -04:00
БогданandGitHub 2ab9783639 Removed non-license notice from the end (#8524) 2023-04-21 21:32:30 -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
MEEPofFaithandGitHub 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
lemon3357andGitHub 68016cc2b5 Update server_v7.json:add new server (#8512) 2023-04-18 10:55:39 -04:00
MEEPofFaithandGitHub 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
Anuken d043c75022 Merge remote-tracking branch 'origin/master' 2023-04-16 12:09:06 -04:00
Anuken 2db90408fe Use schematic/map names for filenames 2023-04-16 12:09:02 -04:00