Commit Graph

1124 Commits

Author SHA1 Message Date
3797265107
Add @MouseTweaksDisableWheelTweak to screens with scrollbars 2022-09-07 13:36:27 +07:00
aea180b68c
Fix wrong ticker order 2022-09-07 12:47:12 +07:00
c6e570744a
да кто такая эта ваша руда 2022-09-07 04:57:10 +03:00
7616483a66
Merge remote-tracking branch 'origin/master' into master 2022-09-07 07:55:01 +07:00
c0c0b01688
findSlot now actually searches for slot panel 2022-09-07 07:53:55 +07:00
ec08a60340
Achieved with FORGE™️ (#23 final) 2022-09-07 03:28:49 +03:00
64485e8b29
fixed funni transforms/perspectives names (#23) 2022-09-07 00:09:00 +03:00
0ae30aa2c8 ZPM model 2022-09-07 01:48:31 +06:00
b51c4780b8
TickList with LinkedList in it
Fixes #50
2022-09-06 23:41:47 +07:00
6c9f71aed8
More minecraft'y tritanium block coloring
fixes #69
2022-09-06 23:08:22 +07:00
5fa901202e
Remove colored blocks recipe variants to reduce clutter 2022-09-06 22:39:07 +07:00
3f23eea95a
Remove debug blocks from creative tab 2022-09-06 22:28:28 +07:00
964a0e5a73
Fix plates being missing from tags 2022-09-06 22:24:42 +07:00
44bb3c2fae
Move crafting result slot to top 2022-09-06 22:18:53 +07:00
5f649d0d7e
More exosuit quickmove fixes 2022-09-06 22:12:15 +07:00
d47fc7af41
Fix quickmove in exosuit inventory 2022-09-06 22:02:16 +07:00
3fdc32622d
Force kotlin and json files to crlf line endings 2022-09-06 21:52:05 +07:00
c75c056790
Merge remote-tracking branch 'origin/master' into master
# Conflicts:
#	src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt
2022-09-06 21:51:11 +07:00
14eece598a
Datagen tags 2022-09-06 21:45:53 +07:00
0489652057
#65 2022-09-06 09:03:56 +03:00
c07d5c668c
DBotThePony — Сегодня, в 8:34
Ойблядь
2022-09-06 08:38:59 +03:00
71e9c0b57e
ура балансим шлемак (#68) 2022-09-06 06:04:58 +03:00
2b3d2e3d75
Update block loottables 2022-09-06 08:39:56 +07:00
aca40e887d
Android station crafting recipe 2022-09-06 08:26:46 +07:00
d00338303e
Fix being able to open android research tree more than once 2022-09-06 08:15:25 +07:00
c3e1300cd1
Improve git version naming [2] 2022-09-06 08:11:43 +07:00
76169cc912
Improve git version naming 2022-09-06 08:04:47 +07:00
4a6fd46114
Add GearShocky to authors 2022-09-06 07:32:30 +07:00
fe48d55c14
каво 2022-09-06 07:25:48 +07:00
2b7ef90154
Use git commit sha and rev to specify mod version 2022-09-06 07:25:15 +07:00
a0a21eb575
кот 2022-09-06 00:22:18 +07:00
77e35917ba
Even better bed button handling 2022-09-06 00:17:23 +07:00
5f3a17da9f
Try to fix selecting wrong button in InBedChatScreen 2022-09-05 23:58:38 +07:00
86eaec61f4
Merge remote-tracking branch 'origin/master' into master 2022-09-05 23:36:31 +07:00
f2b0f966ec
fix tests failing 2022-09-05 23:35:07 +07:00
027f6446f1
Exosuit Crafting upgrade as item 2022-09-05 23:30:29 +07:00
e7653d559f
Synchronized maps, update save keys, exosuit inventory upgrades as items 2022-09-05 23:13:48 +07:00
c608ade2da A 2022-09-05 18:50:50 +06:00
cee4ebc754 A 2022-09-05 18:31:06 +06:00
884f841bbd Placeholder models/textures 2022-09-05 18:26:02 +06:00
2915ef675b
Merge remote-tracking branch 'origin/master' into master 2022-09-05 18:54:37 +07:00
4cca4d2edc
Make singularity be wither immune 2022-09-05 18:53:38 +07:00
f94e3f11e4
Extract energy interface from mattery player into own class 2022-09-05 18:47:13 +07:00
dbe72c2311 FLOOR TILES YEEEE- (x2) 2022-09-05 17:44:09 +06:00
80a576f6a7 FLOOR TILES YEEEE- 2022-09-05 15:13:17 +06:00
effa387210 Merge remote-tracking branch 'origin/master' 2022-09-05 15:12:10 +06:00
11484eeec3
fix getting wrong index from arguments 2022-09-05 16:11:49 +07:00
ea19ab856f FLOOR TILES (white) UPDATE WOOOOOOOOOOO- 2022-09-05 15:10:03 +06:00
f0790eec1e "Гиршок, Там баг, АААААААА, Удоли ?.also" 2022-09-05 13:50:28 +06:00
ab2d4926ba
Merge remote-tracking branch 'origin/master' into master 2022-09-05 10:30:34 +07:00