mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-13 19:39:04 +07:00
Code Issues Packages Projects Releases Wiki Activity
3,164 Commits 4 Branches 160 Tags 2.3 GiB
5a9307e9a7
Commit Graph

3164 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
6caf0fc1cc Merge remote-tracking branch 'origin/master' 2018-12-05 19:00:18 -05:00
Anuken
8d28976b0d Misc cleanup 2018-12-05 19:00:10 -05:00
Prosta4okua
26e972314e
Update bundle_uk_UA.properties 2018-12-05 22:44:03 +02:00
iczero
8a582f8872 Check client version type against server version type (#367) 2018-12-05 15:43:13 -05:00
Anuken
ca04504573 Renamed internal 'noWaves' mode / Fixed text encoding issues 2018-12-05 15:38:32 -05:00
Anuken
80360214df Bar re-scaling 2018-12-05 13:33:03 -05:00
Baltazár Radics
c69eae486e
Merge pull request #11 from Timmeey86/baltitenger 
Fixes requested by Anuke
 2018-12-05 19:09:14 +01:00
Timmeey86
57bebd3fb6 Removed file which was not supposed to be commited 2018-12-05 18:57:52 +01:00
Timmeey86
329dac77ee Consumers only draw power when all other required inputs are valid 2018-12-05 18:56:07 +01:00
Timmeey86
e5dabc63c2 Removed power bars from producers 2018-12-05 18:03:50 +01:00
Anuken
f652135e19 Merge remote-tracking branch 'origin/master' 2018-12-04 18:31:02 -05:00
Anuken
6bf7d8b111 ok desktop 2018-12-04 18:30:55 -05:00
Predator127
004ad0eb8c PT-BR updated (#365) 2018-12-03 12:46:48 -05:00
Skybbles // L5474
989034c799 Made Unloader have the same "memory" as the sorter (#366) 
I implemented the same 'memory' feature as the sorter's, introduced in b62. It's sort of under the 'sorter' category in terms of features, so I thought it would be logical to do so.
 2018-12-03 12:46:31 -05:00
Baltazár Radics
c2334ce80a
Merge pull request #10 from Timmeey86/baltitenger 
Continued work on Power Generators
 2018-12-03 18:46:06 +01:00
Anuken
6d59fe3080 Bugfixes 2018-12-03 10:33:50 -05:00
Anuken
9c01256029 Output cleanup 2018-12-02 17:04:55 -05:00
Anuken
e33c863162 Bugfixes 2018-12-02 16:56:44 -05:00
Prosta4okua
787a9c0083
Update bundle_uk_UA.properties 2018-12-02 22:12:39 +02:00
Prosta4okua
c75c22955c
Update bundle_uk_UA.properties 2018-12-02 22:01:42 +02:00
Anuken
5afb5d24d8 Wave preset changes 2018-12-02 13:57:13 -05:00
Anuken
134cc34d74 Merge remote-tracking branch 'origin/master' 2018-12-02 12:03:41 -05:00
Anuken
3397d6c907 Misc bug/crash fixes 2018-12-02 12:03:18 -05:00
Timmeey86
f8cf185db9 Fixed display of solar panel power generation 2018-12-02 12:43:18 +01:00
Anuken
735935c0c4 Merge branch 'remove-tile-pack' of https://github.com/Anuken/Mindustry 2018-12-01 17:36:16 -05:00
Anuken
fd3beaf2b9 Removed silicon coal requirement 2018-12-01 14:48:55 -05:00
Timmeey86
034fab480d Most direct consumers now operate slower when not supplied with full power 2018-12-01 18:32:17 +01:00
VizardAlpha
17432d1f94 Update bundle_fr_BE.properties (#361) 
* Update bundle_fr_BE.properties

* Updates bundle_fr_BE.properties
 2018-12-01 11:22:28 -05:00
Timmeey86
62c6d8e42d Fixed Arcs not firing 2018-12-01 16:49:30 +01:00
Timmeey86
14e057cf05 - Resolved all remaining TODOs 2018-12-01 16:13:03 +01:00
Timmeey86
982c9bf964 - Fixed double power production 
- Buffered consumers no longer request power when full
 2018-12-01 14:31:01 +01:00
Timmeey86
b4aba3d263 All power blocks now produce power as stated in v63 tool tips 2018-12-01 13:41:14 +01:00
Anuken
9f9d57b9a9 Merge remote-tracking branch 'origin/master' 2018-11-30 23:12:52 -05:00
Anuken
236e3c7e61 Added wet shocking 2018-11-30 23:12:48 -05:00
Anuken
2160844ad0 Merge remote-tracking branch 'origin/master' 2018-11-30 17:48:19 -05:00
Anuken
51475d600c iOS fix 2018-11-30 17:48:09 -05:00
Timmeey86
149f7a1d9d Merged current master into branch (with manual changes) 2018-11-30 21:33:09 +01:00
elmenda452
56ef7ae60c Update bundle_es.properties (#360) 
It was strangely hard to find the (Constructing) translation... (for block.constructing), but anyway I finally found it
 2018-11-30 15:16:54 -05:00
Anuken
7ec6586c4a Line power nodes 2018-11-30 15:14:27 -05:00
Timmeey86
074a6bfa87 Reverted accidental file push 2018-11-30 21:10:31 +01:00
Timmeey86
965fec5927 Continued work on power generators 2018-11-30 21:08:33 +01:00
Anuken
58b87aa999 Additional crash fixes 2018-11-30 13:49:43 -05:00
Anuken
b0b16b52ee Merge remote-tracking branch 'origin/master' 2018-11-30 13:20:39 -05:00
Anuken
9ab3f7e5aa Crash fix 2018-11-30 13:20:15 -05:00
Timmeey86
61210955bd Optimized power distribution implementation for buffered consumers 2018-11-30 18:45:40 +01:00
Timmeey86
28f73d0a76 Merged ItemGenerator, LiquidGenerator and ItemLiquidGenerator into a single class. 
Unit tests now test the ItemsOnly, LiquidsOnly and LiquidsAndItems cases
 2018-11-30 18:37:51 +01:00
Anuken
99fb1a4c5f Implemented null-items for sorters and item sources 2018-11-30 10:28:27 -05:00
Baltazár Radics
42cf80106f
Merge pull request #9 from Timmeey86/baltitenger 
Resolved more TODOs
 2018-11-30 05:46:35 +01:00
Timmeey86
bcb9cfd2fe Synchronized Item/Liquid generator code 2018-11-30 00:03:53 +01:00
Timmeey86
1d57568322 All power distributors now update power graph 
Replaced manual power graph update by base implementation call so future changes in base class get applied to all subclasses automatically. Added the call where missing.
 2018-11-29 23:35:56 +01:00