Commit Graph

3029 Commits

Author SHA1 Message Date
cae867cb4d
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3 2024-01-04 20:29:05 +07:00
76c4c3e6a2
Post merge fixes for 1.19.4 2024-01-04 20:23:11 +07:00
a68c08ecf8
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4 2024-01-04 20:18:14 +07:00
f9dcf43cc4
Fix compilation error 2024-01-04 20:12:29 +07:00
42fe77e6b4
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1 2024-01-04 20:10:11 +07:00
486c9b00c9
Remove text from text field when doing right mouse click, and text field is not multiline 2024-01-04 20:01:14 +07:00
54ba7e94c6
Cursor type for android research tree 2024-01-04 19:59:57 +07:00
ed73c9fda8
Always display transfer history when pressing shift 2024-01-04 19:41:05 +07:00
f4bbf54095
Android station coloring 2024-01-04 19:37:36 +07:00
c69781c22c
Fix cursor wars between panels when grabbing mouse input 2024-01-04 19:08:20 +07:00
70ec49e546
Display panel's mouse cursor if it grabs mouse input 2024-01-04 18:58:20 +07:00
dbc793a592
Add hand cursor to progress gauge panel 2024-01-04 18:53:12 +07:00
c52995541b
Mouse cursors support 2024-01-04 18:36:52 +07:00
005c8b0396
Holo sign text coloring 2024-01-04 17:48:56 +07:00
a72f2aabb2
Make underwater travel challenge account for displacement, and not distance 2024-01-04 16:57:10 +07:00
ebafdbc925
Set MAX_ENERGY default config value to infinity 2024-01-04 16:38:09 +07:00
9800eb35ba
Fixed energy consumption not being merged properly 2024-01-04 16:37:41 +07:00
b3651b1f86
Powered furnace cleanup 2024-01-04 16:26:42 +07:00
8aa34b3645
Induction furnace and powered furnace painting 2024-01-04 15:57:12 +07:00
26cb0c8cba
Implement matter recycler coloring 2024-01-04 15:11:38 +07:00
ce8c257928
Some cleanup of code from previous commits 2024-01-04 14:57:33 +07:00
3f2e90e55c
Merge remote-tracking branch 'origin/1.20.2' into 1.20.2 2024-01-04 14:06:48 +07:00
5b51c5e655
Microwave oven painting 2024-01-04 14:06:23 +07:00
071bb7b3ad Chug xp 2024-01-04 12:46:19 +06:00
9ecf53342e
More machine coloring 2024-01-04 13:40:40 +07:00
895ed6fbef Fix Computer 1000 yard stare + 4chair 2024-01-04 12:38:38 +06:00
9d876c573c
Merge remote-tracking branch 'origin/1.20.2' into 1.20.2 2024-01-04 12:07:45 +07:00
0c004aedc5
Some unifications regarding item tooltips 2024-01-04 01:06:55 +07:00
1e8aecb5d7
Maintain inner list of decorative blocks to register 2024-01-04 00:00:06 +07:00
f36019b4ef
Subscribe to these vents only when running client 2024-01-03 23:50:05 +07:00
8f92b8d3f1
Add computer terminal as actual block 2024-01-03 20:46:51 +07:00
800fd54d8e
Explicitly inherit string matter value for wool 2024-01-03 20:04:46 +07:00
0dcf6664a3
Add painter recipes to matter recipe finder 2024-01-03 20:03:23 +07:00
b2c2bfa536
Plate press coloring 2024-01-03 19:56:50 +07:00
d6dc8689f8
Essence storage coloring 2024-01-03 18:51:59 +07:00
cb50ee2c68
Colored machines test, update creative menu order
update SupplierList/Map impl to use Java's suppliers
general code layout improvements
2024-01-03 18:36:06 +07:00
73773d4c70 tele jigsaw grunt pathic telepathic st'ructure processor jigsaw worldgenjson 2024-01-03 16:53:27 +06:00
0ab411fd90
Add "none" to BlockRotationFreedom 2024-01-03 15:11:49 +07:00
565819c3e3
Add placeholder textures for liquid xp 2024-01-03 15:06:36 +07:00
c5ea764848
Shorten configuration titles 2024-01-03 15:04:27 +07:00
56db45a0d4
Add liquid xp locale strings 2024-01-03 15:03:20 +07:00
e08c81520f
Actually expose fluid handler of essence storage 2024-01-03 15:00:50 +07:00
6e16364491 Laboratory rebuild WIP + decorative computer model 2024-01-03 09:57:03 +06:00
0f14c3eaa0
Downgrade worldedit 2024-01-02 20:35:50 +07:00
9e9c4168d6
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3 2024-01-02 20:35:23 +07:00
bc59853f4e
Downgrade worldedit 2024-01-02 20:34:35 +07:00
9b80162a03
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4 2024-01-02 20:34:06 +07:00
b28e180704
Downgrade worldedit 2024-01-02 20:33:42 +07:00
2deaef94aa
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1 2024-01-02 20:33:11 +07:00
733b9edcad
Add worldedit to runtime envrionment 2024-01-02 20:32:35 +07:00