Commit graph

42 commits

Author SHA1 Message Date
3a69157d10 TagRenderingConfig: fix 'leftovers' of multi-answer freeform, generateDocs now generates Markdown instead of a BaseUIElement, add 'postfixDistinguished'-option for 'charge'-key 2024-06-06 03:16:36 +02:00
8fcaa59f9d Move bicycle_tube_vending_machine into vending_machine 2024-06-03 17:38:11 +02:00
db825a3ca9 Chore: translation sync 2024-01-10 01:22:53 +01:00
e13e9f652c Chore: reordering attributes to have a fixed order 2023-10-30 18:08:38 +01:00
29ff09024f Merge develop 2023-10-30 16:32:43 +01:00
7c6ebc959c Merge branch 'master' into develop 2023-10-30 13:45:02 +01:00
9ee3343426 chore: automated housekeeping... 2023-10-30 13:44:27 +01:00
Robin van der Linde
b50e54e3e4
Walking node theme + other fixes 2023-10-19 12:51:44 +02:00
553ee6d5aa Merge develop 2023-10-17 16:57:49 +02:00
52bebf4daf Chore: translation sync 2023-10-16 13:38:53 +02:00
c358a4c415 Merge master 2023-10-14 23:29:16 +02:00
f77d99f8ed Refactoring: use more accurate context in conversion, fix tests 2023-10-12 16:55:26 +02:00
08ffe4b7c0 Merge develop 2023-10-11 04:34:57 +02:00
0bdb35a016 Chore: housekeeping 2023-10-10 01:52:02 +02:00
19a760178b Refactoring: split icons into proper layered icons, fix and rerun shops-thief 2023-10-06 23:56:50 +02:00
1f67ab2aca Chore: merge upstream translations 2023-10-06 03:10:56 +02:00
2d50323f21 Chore: translation sync 2023-10-06 02:44:40 +02:00
c3041af5f7 Merge master 2023-10-06 02:27:49 +02:00
Robin van der Linde
f3d36efd41
Add options, website, missing badge (#1634 #1622) 2023-10-03 20:36:31 +02:00
0c9a4576c0 Chore: translation sync 2023-10-02 00:23:20 +02:00
55c6442cac Merge develop 2023-10-01 13:13:07 +02:00
ffeb18d0e5 Chore: housekeeping 2023-09-30 15:36:19 +02:00
6ab0d45776 Chore: translation sync 2023-09-29 00:09:39 +02:00
f0311c635a Merge master 2023-09-28 23:54:57 +02:00
8ef9b48e2b Chore: translation sync 2023-09-28 16:56:25 +02:00
Robin van der Linde
144d203a5b
Standardize tagging, add items and translations 2023-09-25 09:24:55 +02:00
Robin van der Linde
b20e887f9a
Merge branch 'develop' into RobinLinde-patch-1 2023-09-25 07:53:46 +02:00
daa03c1aa3 Chore: translation sync 2023-09-24 00:40:13 +02:00
86d0e5dc74 Themes: vending machines: add meat as option, add operator phone number, add 'condom' icon, fix #1584 2023-09-23 23:43:20 +02:00
Robin van der Linde
25ab170a2b
Disable presets, add meat option (#1582 #1584) 2023-09-23 14:54:07 +02:00
badfbb60e4 Chore: formatting 2023-09-21 15:29:34 +02:00
3c5edaf8af Chore: sync translations 2023-09-19 14:05:43 +02:00
dc82ebbd58 Studio: WIP 2023-09-19 14:04:13 +02:00
42c7bbe1c9 Chore: formatting 2023-09-16 18:52:42 +02:00
Robin van der Linde
315cfa5e75
Add more vending options when zoomed in 2023-08-29 09:46:58 +02:00
701d0a509e
Merge pull request #1521 from pietervdvn/feature/reuse-compliance
Feature/reuse compliance
2023-07-27 15:10:53 +02:00
b7d3fac275 Chore: fix and merge translations 2023-07-27 12:56:26 +02:00
0d598ad094 More steps toward REUSE-compliance 2023-07-27 03:32:49 +02:00
d3aa5562a5 Unify some license expressions 2023-07-27 02:51:59 +02:00
Robin van der Linde
ac19409481
Add two icons, enable deletion and move 2023-07-09 20:28:33 +02:00
Robin van der Linde
5c9a7f6aaa
Remove elongated_coin from vending_machine 2023-07-09 18:37:39 +02:00
Robin van der Linde
3bdf519205
Small vending machine theme 2023-06-29 16:30:43 +02:00