mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-11 18:39:16 +07:00
Code Issues Packages Projects Releases Wiki Activity
6,442 Commits 4 Branches 160 Tags 2.3 GiB
4f195b72d1
Commit Graph

6442 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick 'Quezler' Mounier
4f195b72d1
Merge branch 'master' into crater 2020-03-15 22:00:51 +01:00
Patrick 'Quezler' Mounier
4b08cfd2b7
Revert "Revert "Repurpose branch to be played"" 
This reverts commit 9df875354a.
 2020-03-15 22:00:45 +01:00
ma44
ec34e27102
map setting refund (#1709) 2020-03-15 14:02:47 -04:00
Anuken
6079980a50 Fixed content loading crash 2020-03-15 09:08:27 -04:00
Anuken
8550995c4e Fixed compilation 2020-03-10 19:51:31 -04:00
Anuken
f63d1874c2 Merge remote-tracking branch 'origin/master' 2020-03-09 09:41:51 -04:00
Anuken
d7f9090c0b Fixed #1672 2020-03-09 09:41:39 -04:00
DeltaNedas
9ef394a99e
set current mod to required mod (#1684) 
or you will need to prefix mod name in requires of the required mod
instead you now need to prefix current mods name after youve required from another mod
 2020-03-07 22:47:12 -05:00
Anuken
7aa71f38c3 Merge remote-tracking branch 'origin/master' 2020-03-07 14:36:50 -05:00
Anuken
8b3d64a29a Better error detection 2020-03-07 14:36:47 -05:00
Patrick 'Quezler' Mounier
f931469132
This does ¬ seem nececary anymore somehow 2020-03-06 18:08:18 +01:00
Patrick 'Quezler' Mounier
afdb0aa8c2
Fix sleep visualizer 2020-03-06 17:21:17 +01:00
Patrick 'Quezler' Mounier
73414d7c2a
Collapse if 2020-03-06 14:59:12 +01:00
Patrick 'Quezler' Mounier
c1f025db52
Rename reload to cooldown 2020-03-06 14:57:11 +01:00
Patrick 'Quezler' Mounier
087aef6b85
Move capacity into crater 2020-03-06 11:06:35 +01:00
Patrick 'Quezler' Mounier
7ddcd93a57
Use extended position 2020-03-06 10:28:49 +01:00
Patrick 'Quezler' Mounier
caa25b811b
Condense single use rotation 2020-03-06 10:22:37 +01:00
Patrick 'Quezler' Mounier
5a60ab1d2a
Privatize drawer 2020-03-06 10:20:47 +01:00
Patrick 'Quezler' Mounier
8a25d57c83
This looks good to 2020-03-06 10:17:02 +01:00
Patrick 'Quezler' Mounier
c5de6706e0
Eyecandyfi 2020-03-06 10:14:52 +01:00
Patrick 'Quezler' Mounier
f50ee2ecf2
Try to clean up the end of tile logic 2020-03-06 09:52:28 +01:00
Patrick 'Quezler' Mounier
11fc494284
Clean up transfer code 2020-03-06 09:34:09 +01:00
Anuken
89a5c957fd
add mod name to js print() (#1677) 
* add mod name to js print()

* add mod name to errors
 2020-03-05 15:58:10 -05:00
Patrick 'Quezler' Mounier
e05f755a4e
Remove unused import 2020-03-05 21:30:18 +01:00
Patrick 'Quezler' Mounier
44bff5b7cf
Remove conveyor integration remnants 2020-03-05 21:29:19 +01:00
Patrick 'Quezler' Mounier
e2b9977ebc
Remove omnidirectional due to issues 2020-03-05 21:27:28 +01:00
Patrick 'Quezler' Mounier
3e51abf6eb
Try to fix blending with omnidirectional 2020-03-05 21:24:51 +01:00
Patrick 'Quezler' Mounier
c1f765a467
Bodge in a rotational blend bypass 2020-03-05 20:26:34 +01:00
Patrick 'Quezler' Mounier
e67667e4a3
Remove preemtive unload 2020-03-05 20:09:09 +01:00
Patrick 'Quezler' Mounier
14a97976cc
Realign pixels 
Bothered me for ages.
 2020-03-05 19:48:36 +01:00
Patrick 'Quezler' Mounier
4a3e00f822
Fix early return 2020-03-05 15:21:41 +01:00
Patrick 'Quezler' Mounier
3ac50a3f3e
, 2020-03-05 14:42:37 +01:00
Patrick 'Quezler' Mounier
6fb4c79f82
Fix sleeping while reloading 2020-03-05 14:29:27 +01:00
Patrick 'Quezler' Mounier
9c75133fc8
Blend tripod dumper with conveyors 2020-03-05 14:21:41 +01:00
Patrick 'Quezler' Mounier
fd61add2e4
Cleanup update loop 2020-03-05 14:10:28 +01:00
Patrick 'Quezler' Mounier
acd695a469
Messy cleanup 2020-03-05 13:40:44 +01:00
Patrick 'Quezler' Mounier
5036506547
Rotate smoother 2020-03-05 13:28:23 +01:00
Patrick 'Quezler' Mounier
b0becbad38
Fix unloading prematurely 2020-03-05 13:22:50 +01:00
Patrick 'Quezler' Mounier
bcb87f8f76
Update description accordingly 2020-03-05 12:15:38 +01:00
Patrick 'Quezler' Mounier
ecb09c0f04
Dump like bridges do 2020-03-05 12:11:55 +01:00
Patrick 'Quezler' Mounier
e7298702a1
Delete drafts 2020-03-05 10:50:21 +01:00
Patrick 'Quezler' Mounier
b74cf71f40
Come up with a new description 2020-03-05 10:50:08 +01:00
Patrick 'Quezler' Mounier
2025c7c669
Fix mech dropoff ¬ working 2020-03-05 10:35:48 +01:00
Patrick 'Quezler' Mounier
00249f62b6
Cleanup if chains 2020-03-05 10:28:10 +01:00
Patrick 'Quezler' Mounier
9df875354a
Revert "Repurpose branch to be played" 
This reverts commit ff578c8540.

# Conflicts:
#	tools/crater-deploy.sh
 2020-03-05 10:10:00 +01:00
Patrick 'Quezler' Mounier
9bc340ba17
Fix end ¬ rendering 2020-03-05 10:08:22 +01:00
Patrick 'Quezler' Mounier
79c965bf8d
Move sleep detector to renderer 2020-03-05 10:08:15 +01:00
Patrick 'Quezler' Mounier
e5e4884448
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-03-05 10:00:02 +01:00
Anuken
0534a4da45
Update bundle_zh_TW.properties (#1665) 2020-03-04 13:53:54 -05:00
Anuken
31c9b61358
Updated join.info (#1666) 2020-03-04 13:53:47 -05:00