Mascali
/
shapez.io
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,431 Commits 2 Branches 0 Tags 543 MiB
Commit Graph

165 Commits

Author SHA1 Message Date
tobspr 296b76bf11 Add virtual shape processing buildings 2020-08-18 20:02:39 +02:00
tobspr 61e7481c8f Change coating -> insulation 2020-08-15 16:19:28 +02:00
tobspr 5a0d3dcbe8 Add wire coating 2020-08-15 16:16:17 +02:00
tobspr 390c4ce1a5 Add display 2020-08-14 14:55:37 +02:00
tobspr 9085f32ec3 Add multiple performance settings 2020-08-14 09:38:48 +02:00
tobspr efd8ba7ae9 Add wire bridges and fix Q on hub crash 2020-08-13 21:04:44 +02:00
tobspr ff02508361 Add transistor building (Gate) 2020-08-13 20:47:33 +02:00
tobspr f44563fc05 Add item filter 2020-08-13 20:30:43 +02:00
tobspr 984bea1921 Add OR gate and different colors of wire based on the value 2020-08-13 20:01:54 +02:00
tobspr 49da768b73 Add NOT gate 2020-08-13 19:33:35 +02:00
tobspr 52b4d4d742 Implement wire networks, add levers 2020-08-13 19:23:00 +02:00
tobspr 75ab655998 Add basic logic gate and improve wires in general 2020-08-13 10:23:50 +02:00
tobspr f4ac6dfe03 Add constant signal emitters 2020-08-12 21:05:32 +02:00
tobspr 850461df8f Further take on logic wires 2020-08-11 18:40:09 +02:00
tobspr 93975df4d5 Get rid of item ejector / acceptor layers and new wires buildings for now 2020-08-10 21:24:58 +02:00
Bjorn Stromberg 3e43fef6c4
Fix YAML Lint Failures (#548) 
* Copy/paste en back over ar, there were no translations

* Sync cat with en

* Coffee hadn't kicked in and I fixed a bunch of warnings instead of errors, oh well.

* Fix base-uk.yaml

* Fix base-hu

* Fix base-da
 2020-08-10 07:35:32 +02:00
Julian Simioni a44ec7182a
Minor English wording improvements (#510) 
* Minor English wording improvements

* Update translations/base-en.yaml

Co-authored-by: Bjorn Stromberg <bjorn@bjornstar.com>

Co-authored-by: tobspr <tobspr@users.noreply.github.com>
Co-authored-by: Bjorn Stromberg <bjorn@bjornstar.com>
 2020-08-07 09:14:24 +02:00
dengr1065 2df1b8d014
Major ui changes (#482) 
* "discord" -> "Discord", sync most translations

* that major settings update you'll like

* Finish new settings, add logo to about page

* sync & format translations
 2020-07-23 08:48:23 +02:00
RogiJAG 150bf718f7 Merge branch 'master' into 180_deg_rotater 2020-07-19 11:15:30 -05:00
RogiJAG adecb64447 Revert "add unlock on upgrade mechanic" 
This reverts commit 6dd3f2a439.

lease enter the commit message for your changes. Lines starting
 2020-07-19 10:47:47 -05:00
Moppler e32926fa08 Add Yaml config and fif all errors 2020-07-19 09:40:52 +01:00
BuildTools 6dd3f2a439 add unlock on upgrade mechanic 2020-07-18 12:03:49 -05:00
Mr.Yawnie 93ac3f70be Added artwork and en translation, unlocks with CCW 2020-07-18 12:03:49 -05:00
tobspr a08fef88f0
Merge pull request #416 from Astavie/master 
Add decimal separator option in translation files
 2020-07-07 19:40:27 +02:00
tobspr ba4ca7f50b Update store translation 2020-07-07 19:33:45 +02:00
Astavie 0caaa055aa decimal separator 2020-07-07 16:19:26 +02:00
tobspr 35f77416ba Update translations to latest version 2020-07-07 13:34:49 +02:00
tobspr f69caa9f1a Change uncolored -> gray 2020-07-07 09:35:23 +02:00
tobspr 6f85d7c810
Merge pull request #397 from isaisstillalive/renameMarker 
Changed "Delete marker" to "Show rename (or delete) marker dialog"
 2020-07-07 09:11:28 +02:00
tobspr 0d6b855253 Allow color inverter to process colors as well 2020-07-07 09:06:17 +02:00
tobspr 2e66c12122 Add ukrainian language prefab 2020-07-07 07:11:39 +02:00
isaisstillalive f1bcec65ad Refactor dialog title 2020-07-07 09:15:32 +09:00
isaisstillalive 8acefda778 Show edit marker dialog instead deleting marker 2020-07-07 08:22:51 +09:00
tobspr 04ea105584 Fix lots of bugs, add wire splitters / mergers 2020-07-06 21:33:37 +02:00
tobspr 6c6ad6af22 Update standalone build script 2020-07-06 08:14:44 +02:00
tobspr 34ef26b289 Fix multiple issues regarding saving / restoring games 2020-07-05 16:56:01 +02:00
tobspr 0b9b35b79e Update store page, again 2020-07-05 13:13:58 +02:00
tobspr 23df0cf1e0 Update store page text 2020-07-05 13:08:13 +02:00
tobspr 5e67ae8548 Update store page 2020-07-05 12:52:33 +02:00
tobspr c87b87c572 Minor phrasing change 2020-07-05 12:14:29 +02:00
isaisstillalive 0ba4722be6 Show confirm dialog instead of notification 2020-07-05 11:14:11 +09:00
isaisstillalive 6a279923e3 If cost is low, copy instead of cut 2020-07-05 09:51:45 +09:00
isaisstillalive 50c53ec1f2 Close-shop-and-stats key mapping doesn't seem to exist 2020-07-03 17:31:19 +09:00
EnderDoom77 d8c88fcb3c
Halfs => Halves 2020-07-02 22:28:05 +02:00
EnderDoom77 f6f583b4f4
Made minor adaptations for consistency or normativity. 
Raise is transitive, use rise when there's no object.
Made capitalisation more consistent
Allow/enable followed by either: gerund or noun. Use infinitive when the subject (who is allowed/able) is explicitly stated. (more natural)
Commas must be used around non-determining relative clauses.
Added hyphens to counter-clockwise (counterclockwise also valid), user-contributed, and auto-orientation (prefix can't be left alone).
Added a few objects (shapes / belts) to make the text more explicit where objects should naturally be stated.
 2020-07-02 21:05:37 +02:00
tobspr d75fb184a4 Implement color inverter building 2020-07-02 18:16:04 +02:00
tobspr b499760d74 Start to work on advanced shape processing 2020-06-28 20:28:46 +02:00
tobspr 0967d5114c Initial take on wires 2020-06-28 19:34:10 +02:00
tobspr 17123fd7b9 Further work on the energy generator 2020-06-28 11:44:30 +02:00
tobspr 498088e678 Update store page description 2020-06-28 10:27:32 +02:00