|
|
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 |
|
|
|
d726db119b
|
Unrefined floor tiles and general floor tiles recipes
|
2022-09-05 10:30:21 +07:00 |
|
|
|
08e7b83ce4
|
Merge remote-tracking branch 'origin/master'
|
2022-09-05 00:53:41 +06:00 |
|
|
|
5f559078e6
|
android station idle texture; plasma rifle separate transforms???
|
2022-09-05 00:40:31 +06:00 |
|
|
|
b7a6571aa4
|
Make singularity be immune to ender dragon
|
2022-09-05 01:22:38 +07:00 |
|
|
|
528afbc7ff
|
Pattern storage minor model update
|
2022-09-05 00:22:02 +06:00 |
|
|
|
6b7778ac35
|
Update battery bank and matter capacitor bank models
|
2022-09-05 00:59:07 +07:00 |
|
|
|
0c0182a65c
|
Fix isHovered being true on out-of-bounds children
|
2022-09-05 00:42:03 +07:00 |
|
|
|
18334da499
|
Fix Item Monitor panel being too tall
|
2022-09-05 00:36:16 +07:00 |
|
|
|
f2b0ad4fec
|
Energy sword no longer breaks blocks in creative
|
2022-09-05 00:35:32 +07:00 |
|
|
|
4babe703c7
|
BackgroundPanel and better power bar position in item monitor
|
2022-09-05 00:31:46 +07:00 |
|
|
|
72a4d14159
|
fix wrong slot index check
|
2022-09-05 00:25:05 +07:00 |
|
|
|
ceda2846c5
|
fix StretchingRectangleElement rendering right bar wrong
|
2022-09-05 00:24:03 +07:00 |
|
|
|
2e7e676739
|
Make exosuit inventory contents appear in LivingDropsEvent when possible
|
2022-09-04 21:04:40 +07:00 |
|
|
|
705eaaf993
|
Obey keepInventory in exosuit inventory
|
2022-09-04 20:29:28 +07:00 |
|
|
|
b54dafe40b
|
Do not consume plasma rifle power if in creative
|
2022-09-04 20:22:59 +07:00 |
|
|
|
91512b0eb8
|
Do not consume exosuit probe if in creative
|
2022-09-04 20:21:17 +07:00 |
|
