Commit Graph

2170 Commits

Author SHA1 Message Date
f71bed5dae
Use prefix to merge result from codec with result json 2023-05-08 09:38:57 +07:00
d5bbd717b6
oops 2023-05-08 09:22:15 +07:00
73e082aeea
ItemStack already has codec 2023-05-08 00:10:10 +07:00
2ca00563e8
Codec2Serializer.embed 2023-05-08 00:09:49 +07:00
be43c59a2d
bytecode moment (fix #249) 2023-05-07 17:09:58 +03:00
0098302f39
YuRaNnNzZZ — Вчера, в 15:08
ботинки приварены друг к другу
2023-05-07 16:54:28 +03:00
56ab86aa3f
carbon mesh and plasma repeater stored energy lang 2023-05-07 16:51:55 +03:00
325d1f5786
рецепты #254 2023-05-07 16:33:13 +03:00
a4888c1982
DBotThePony — Вчера, в 16:20
:umer:
Вопрос только в том, а почему не переместить типичные патчи в mixin

----------
ну и починил /clear для экзокостюма
2023-05-07 02:08:53 +03:00
c9fa920a82
Move energy sword sweep patch to mixin 2023-05-06 20:20:24 +07:00
b6ae90e743
Merge remote-tracking branch 'origin/master' into master 2023-05-06 20:13:40 +07:00
f26f5a51bb
"fix" one pixel item offset 2023-05-06 20:06:10 +07:00
738479b6ee
Procedural batteries in dungeons! 2023-05-06 19:55:02 +07:00
1a7f88211b
Allow setting energy of itemenergystorageimpl 2023-05-06 13:18:36 +07:00
82448924be
e 2023-05-06 13:18:07 +07:00
acf5ce9fbc
УВЫ 2023-05-05 17:11:55 +03:00
d0ffa85647
Make hammer deal actual damage when attacking mobs and make it not spammable 2023-04-26 17:50:17 +07:00
2feb540076
Rebalance explosive hammer config values to make it more practical 2023-04-26 17:31:17 +07:00
3e36725f9e
Move explosive hammer config to appropriate place 2023-04-26 17:29:37 +07:00
37a91c525e
Fix some issues regarding datagen 2023-04-26 16:54:46 +07:00
8661d95bdb
помогите 2023-04-26 06:40:17 +03:00
7e9d5ddbf8
Make it compile against 1.19.4 2023-04-26 08:21:31 +07:00
e60dda4810
Update tags datagen 2023-04-26 07:41:32 +07:00
d151ba46fb
Small adjustments 2023-04-24 16:29:11 +07:00
232eeec9be
Вот гиршок твоя броня 2023-04-18 10:28:56 +07:00
70f38c7e54 Remove unnecessary "thrusters" on tritanium armor 2023-04-17 02:40:21 +06:00
7eaf180827 make 2023-04-17 02:37:48 +06:00
17abc2e29b Item textures for simple trarmor 2023-04-17 02:37:05 +06:00
8f8f7db0a8 Simple tritanium armor textures
I am too afraid to touch things in it to add a SIMPLE 2D LAYER ARMOR so i'll leave actually adding it
2023-04-17 01:47:37 +06:00
d3f97bfaa3
Move procedural exopack slot upgrade to proper subpackage 2023-04-16 21:18:37 +07:00
85aa5e7ce9
hmm 2023-04-16 19:30:52 +07:00
2ba1edf88d
Fix imports 2023-04-16 19:15:04 +07:00
cdd6ef9eb3
Sort item classes to subpackages, correct some code 2023-04-16 19:10:27 +07:00
c5d9ba34dd
Simple Tritanium Armor, some balancing to regular tritanium armor 2023-04-16 12:43:20 +07:00
3976c6da56
Make tritanium armor absorb 3/4 of cosmir radiation 2023-04-16 10:11:32 +07:00
e2a300259c
Swap execution order in moveEnergy 2023-04-16 10:05:46 +07:00
b7434d632c
Try to move as much as possible energy between energy storages 2023-04-16 00:09:16 +07:00
a65fb6d829
Merge remote-tracking branch 'origin/master' into master 2023-04-15 23:47:48 +07:00
8d63488d72
oh my god are you serious? 2023-04-15 23:46:47 +07:00
1828704859
Remove storage blocks from machines list 2023-04-15 15:41:05 +07:00
ba326b9fb8
Add profiled energy storage to most of machines 2023-04-15 14:09:24 +07:00
8afa21ae16
Profiled energy storage! 2023-04-14 23:58:38 +07:00
8c32a2cd7a
Put constants in decimal cache 2023-04-14 23:58:17 +07:00
20bbaec62a
Kotlin? Hello? 2023-04-14 22:45:39 +07:00
5df3a06fcb Perish 2023-04-14 19:20:25 +06:00
60ac4d60d2 did i deadass rollback this 2023-04-14 19:19:26 +06:00
addd088cc4
Sort matter json namespaces according to mod order 2023-04-14 14:59:02 +07:00
a51398e220
Fix mattery gui tracking last mattery player state wrong 2023-04-14 13:06:13 +07:00
130240e02a
Tritanium bars, but with proper model 2023-04-14 12:59:33 +07:00
de972f1688 Merge remote-tracking branch 'origin/master' 2023-04-13 23:34:28 +06:00
90fa7593f8
Carbon mesh recipe 2023-04-13 23:41:57 +07:00
2a910d2f96 OM NOM NOM 2023-04-13 22:28:35 +06:00
56a8831364 Merge remote-tracking branch 'origin/master' 2023-04-13 21:54:36 +06:00
bd357dad5f
Add is_primed property to hammer 2023-04-13 22:53:54 +07:00
951df4a7d1 explosive hammer model 2023-04-13 21:06:39 +06:00
08ca69fb0f
Merge remote-tracking branch 'origin/master' into master 2023-04-13 21:08:04 +07:00
8760fc3ec0
Explosive Hammer 2023-04-13 21:07:29 +07:00
f0076aca99
Fix EMP damage missing itemstack 2023-04-13 19:23:25 +07:00
ff4c24d5f6
Fix EMP damage not being actually dealt 2023-04-13 19:23:06 +07:00
607512cf1b Texture updates 2023-04-11 23:01:57 +06:00
50b19c3a31 Make shield use reinforced stuff too, also more edits 2023-04-11 04:27:11 +06:00
89847ac34a texture stuff 2023-04-11 04:19:29 +06:00
6a9df1d79b Liquid running gif 2023-04-11 04:06:53 +06:00
fc27199ce2
а где 2023-04-10 17:08:29 +03:00
3870428f5d
окно в европу 2023-04-10 16:58:51 +03:00
0bbe07f921
Fix non stackable items not getting moved to filtered slots first 2023-04-10 19:26:45 +07:00
9a1323ba46 AEUUGHH 2023-04-10 02:30:46 +06:00
8093d314d7 b 2023-04-10 02:28:56 +06:00
cf5d0455cf a 2023-04-10 01:22:23 +06:00
5e444300a1 Fluid tank is now transparent 2023-04-08 20:43:05 +06:00
d92dde8966
Use FluidUtil.interactWithFluidHandler 2023-04-08 01:40:14 +07:00
85ed4802f4
lol 2023-04-07 20:13:28 +07:00
13bfa7f2b2
Add datagen for fluid capsule and fluid tank 2023-04-07 20:11:34 +07:00
c3568a7fc1
Фиксим гигаприколы с IFluidHandler 2023-04-07 19:53:30 +07:00
56f3395c47 Oops 2023-04-07 18:50:14 +06:00
cc1b944eba Fluid tank and capsule 2023-04-07 18:48:14 +06:00
0eb9d99e3b Mesh and Reinforced Tritanium textures 2023-04-07 18:12:02 +06:00
509630ca35
More lenient "fill" checks 2023-04-06 15:16:39 +07:00
7ce73bdb52
Make fluid tanks drop item contents when broken 2023-04-06 15:13:32 +07:00
90f345a2d9
Fluid tanks
general improvements to SI prefix formatter
networking regarding fluid stacks
Own fluid handler implementations
2023-04-06 15:07:11 +07:00
82e410ad33
Use onItemUseFirst 2023-04-02 15:10:13 +07:00
516de507e4
Fluid capsules test 2023-04-02 14:48:28 +07:00
6c4c40073e
Merge remote-tracking branch 'origin/master' into master 2023-03-28 09:06:19 +07:00
7d5a585897 perish 3 2023-03-27 18:55:21 +06:00
828b8d1039 Add a slight animation to Android station's holograms + LET IT GLOW 2023-03-27 18:53:55 +06:00
8928e8e31b Perish 2 2023-03-27 18:27:57 +06:00
ae622739b9 Revert "Perish"
This reverts commit 5b0988f08e.
2023-03-27 18:18:05 +06:00
51c23b425c Cargo crates texture update 2023-03-27 18:17:14 +06:00
5b0988f08e Perish 2023-03-27 18:13:46 +06:00
42dcd22043
hmm 2023-03-27 18:34:20 +07:00
2752a82225 Active engine model (WIP) 2023-03-26 19:18:12 +06:00
77cb483774 Oops 2023-03-26 17:05:22 +06:00
cbde740747 ACKSHUALLY 2023-03-26 16:53:01 +06:00
d373393a5c
use array 2023-03-26 15:42:44 +07:00
faf43657fc
Androids no longer get hunger from "eating" raw food 2023-03-26 15:35:48 +07:00
7869d686f7
Fix crash caused by panel removing itself during tick 2023-03-26 15:16:16 +07:00
dd7ec5d839
CAGO 2 2023-03-25 23:05:43 +03:00
c81f181c46 Merge remote-tracking branch 'origin/master' 2023-03-25 23:39:27 +06:00
44d4c6bbbe Tritanium bars (pls fix) 2023-03-25 23:39:12 +06:00
a7dbae85ab Essence storage funni 2023-03-25 23:38:20 +06:00