Commit Graph

54 Commits

Author SHA1 Message Date
9cf7d7d7a2 Merge branch 'main' into aperx 2025-04-07 17:13:29 +09:00
Cooldude2606
aedc3cff6b Fix lint errors on new luals version (#384) 2025-04-06 17:05:40 +01:00
9190733d82 Merge branch 'explosivegaming:main' into aperx 2025-03-07 23:45:09 +09:00
Cooldude2606
7504043b05 Remove admin_only from get-roles 2025-03-07 14:37:23 +00:00
5241a41ff3 . 2025-02-06 23:14:28 +09:00
f84b0adee7 Fix role check in /kill (#375)
* Update kill.lua

* Update kill.lua

---------

Co-authored-by: Cooldude2606 <25043174+Cooldude2606@users.noreply.github.com>
2025-02-06 13:55:27 +00:00
946cc583b1 . 2025-02-06 20:43:29 +09:00
a3f3ec3991 . 2025-02-06 20:40:10 +09:00
b94e5e4dad . 2025-02-06 20:34:23 +09:00
a041fe0a38 Allow Waterfill with Recipe (#364)
* Update waterfill.lua

* Update en.cfg

* Update zh-CN.cfg

* Update zh-TW.cfg

* Update zh-CN.cfg

* Update zh-TW.cfg

* Update waterfill.lua

* Update waterfill.lua

* Update waterfill.lua

* Update tool.lua

* Update waterfill.lua
2025-02-03 21:43:40 +00:00
7adf4a4477 Add Kill Effect (#366)
* Update kill.lua

* Update kill.lua

* Update kill.lua
2025-02-03 21:36:40 +00:00
44d025edd6 Fix "repair:6:3439203 'health': real number expected got inf." (#372) 2025-02-03 21:25:03 +00:00
f63ebf8e7c . 2025-02-03 18:07:06 +09:00
f7549b8017 .. 2025-02-03 18:06:54 +09:00
420e3cdfca Fix non english locale issue (#368)
* Update cheat.lua

* Update zh-CN.cfg

* Update zh-TW.cfg
2025-02-02 22:43:16 +00:00
8680e5fbfb Merge branch 'aperx' into main 2025-01-30 16:49:14 +09:00
Cooldude2606
bd6781b3a0 Start converting GUI modules 2025-01-30 00:07:07 +00:00
40bf727e49 . 2025-01-29 00:45:39 +09:00
8407c1357d . 2025-01-29 00:43:43 +09:00
c62cfc413d . 2025-01-29 00:36:26 +09:00
fd5d95bcd8 . 2025-01-29 00:35:57 +09:00
cc590372de . 2025-01-29 00:34:20 +09:00
fc7c9d41ad . 2025-01-29 00:32:54 +09:00
9e1f7530e2 . 2025-01-28 22:21:07 +09:00
bbe25ec120 . 2025-01-28 17:05:23 +09:00
1aaae3fa13 . 2025-01-27 00:00:04 +09:00
a7a0e85a95 . 2025-01-26 22:02:17 +09:00
c2089a89ba . 2025-01-26 13:50:58 +09:00
a86a625d62 . 2025-01-26 13:50:43 +09:00
403bace3ab . 2025-01-23 22:22:53 +09:00
852cf45d0c . 2025-01-22 18:39:18 +09:00
b297b0d0b7 . 2025-01-22 18:32:28 +09:00
733c70823a . 2025-01-22 18:31:07 +09:00
fe901c5f11 . 2025-01-22 18:30:24 +09:00
112d5b7bda . 2025-01-22 18:27:36 +09:00
3914e4594d . 2025-01-22 18:17:14 +09:00
b8f78835d0 . 2025-01-22 18:11:19 +09:00
70625f0888 . 2025-01-22 18:01:47 +09:00
c9700414c7 . 2025-01-11 22:10:26 +09:00
3632738501 . 2025-01-10 17:37:33 +09:00
645d693583 . 2025-01-10 14:22:33 +09:00
ea04b93c7c . 2025-01-10 14:13:12 +09:00
518f1fc561 . 2025-01-10 14:04:17 +09:00
Cooldude2606
1042897d0f Fix comparator for all role types 2025-01-03 23:32:34 +00:00
Cooldude2606
7f14fd359b Fix comparator for lower_role type 2025-01-03 18:10:01 +00:00
6c6a8e03ff Adjust Auto Research Queued Number (#345) 2025-01-02 20:28:58 +00:00
e02e50a17b Remove rocket requirement for auto research (#342) 2024-12-30 19:36:45 +00:00
8c19d67450 Add Tool Gui (#20)
* Update _file_loader.lua

* Create tool.lua

* Update trains.lua

* Update research.lua

* Fix use of created_entity in events

* Update trains.lua

* Update tool.lua

* Update research.lua

* Update research.lua

* Update tool.lua

* Update research.lua

* Update trains.lua

* Fix waterfill locale

* Fix bug with selection tools and remote view

* Fix tool GUI

* Update tool.lua

---------

Co-authored-by: Cooldude2606 <25043174+Cooldude2606@users.noreply.github.com>
2024-12-28 17:29:51 +00:00
65cadc4040 Update Research Milestones (#17)
* Update research.lua

* Update research.lua

* Update research.lua

* Update research.lua

* Update research.lua

* Update research.lua

* Update research.lua

* Update research.lua

* Update research.lua

* Update research.lua

* Update research.lua

* Update research.lua

* Update research.lua

* Update research.lua

* Fix use of created_entity in events

* Fix to use correct module pattern

---------

Co-authored-by: Cooldude2606 <25043174+Cooldude2606@users.noreply.github.com>
2024-12-24 16:17:07 +00:00
4118acf91a Research (#2) 2024-11-19 22:37:52 +00:00