Commit Graph

2980 Commits

Author SHA1 Message Date
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
2ae5166a01
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3 2024-01-02 18:08:55 +07:00
cac468685e
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4 2024-01-02 18:08:37 +07:00
78ac178526
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1 2024-01-02 18:08:11 +07:00
c5313d405b
Actually make metal beams behave like pillars 2024-01-02 18:06:14 +07:00
37ce7343d4
Fix damage type names 2024-01-02 15:29:40 +07:00
0944e55141
Merge branch '1.19.4' into 1.19.3 2024-01-02 15:16:33 +07:00
c98562f2cb
Merge branch '1.20.1' into 1.19.4 2024-01-02 15:16:32 +07:00
92f2680feb
Use appropriate texture for status effect background 2024-01-02 15:16:28 +07:00
783c2bde34
Merge branch '1.19.4' into 1.19.3 2024-01-02 15:05:26 +07:00
b8f98f0e9e
Merge branch '1.20.1' into 1.19.4 2024-01-02 15:05:25 +07:00
077e82064b
Merge branch '1.20.2' into 1.20.1 2024-01-02 15:05:25 +07:00
e6203e11b5
Fallback to zero if there is excess data when deserializing infinities 2024-01-02 15:05:22 +07:00
cae417b3b4
Fix item icons not being rendered correctly 2024-01-02 14:38:58 +07:00
57cc9730f8
Merge branch '1.19.4' into 1.19.3 2024-01-02 13:53:50 +07:00
1d68f32b19
Fix multiplayer RecipeSerializer.codec
# Conflicts:
#	build.gradle.kts
2024-01-02 13:53:33 +07:00
6b6f9f8062
Merge branch '1.19.4' into 1.19.3 2024-01-02 12:26:48 +07:00
6e4bf4e7ec
Merge branch '1.20.2' into 1.20.1 2024-01-02 12:26:47 +07:00
ae544e8844
Merge branch '1.20.1' into 1.19.4 2024-01-02 12:26:47 +07:00
0a5dbf468f
Update author list 2024-01-02 12:24:09 +07:00
5b45cf7d0a
Merge branch '1.20.2' into 1.20.1 2024-01-02 12:22:08 +07:00
46d5f8b76b
Revert import changes 2024-01-02 12:21:48 +07:00
ea448788c5
Merge branch '1.19.4' into 1.19.3 2024-01-02 12:10:51 +07:00
37e7f42587
add missing import 2024-01-02 12:10:43 +07:00
34a9bfd48a
Merge branch '1.19.4' into 1.19.3 2024-01-02 12:01:48 +07:00
7f15ae6a3a
Merge branch '1.20.1' into 1.19.4 2024-01-02 12:01:30 +07:00
edea36a8a6
Merge branch '1.20.2' into 1.20.1 2024-01-02 12:00:12 +07:00
113db7fa9e
Add microwave oven block shape 2024-01-02 11:53:52 +07:00
063095df10
Merge branch 'master' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into master 2024-01-02 11:42:45 +07:00
76de15f01b Update the texture for metal beams and lamps 2024-01-02 00:15:39 +06:00
ea448c5262 More texture adjustments 2024-01-01 23:51:32 +06:00
355242b470 Merge remote-tracking branch 'origin/master' 2024-01-01 23:17:20 +06:00
ffa94d190d Microwave 2024-01-01 23:16:59 +06:00
8a891e6ffb
Merge branch '1.19.4' into 1.19.3 2024-01-01 22:44:09 +07:00
ad76b4cabc
Fix tooltips being wrongly positioned 2024-01-01 22:41:58 +07:00
9cf66e443e
Fix items being rendered with 1 pixel offset 2024-01-01 22:24:15 +07:00
2506f0fe0e
Fix missed translatable contents 2024-01-01 22:17:23 +07:00
2aa084290b
Make mod compile against 1.19.3 2024-01-01 22:15:32 +07:00
b9f6b65900
Make main source set compile against 1.19.3 2024-01-01 22:12:39 +07:00
41ce2841b1
More backporting 2024-01-01 22:04:53 +07:00
a5ba27cf63
More backporting 2024-01-01 22:04:26 +07:00
7b415fbce3
More backporting 2024-01-01 22:01:57 +07:00
2a117a540e
More backporting 2024-01-01 21:07:43 +07:00
df15bd2f69
More backporting 2024-01-01 17:55:27 +07:00
6bee0784d3 Texture adjustments 2024-01-01 16:42:47 +06:00
34ef50f6ee
Merge branch '1.20.2' into 1.20.1 2024-01-01 17:31:29 +07:00
2cc8215cb0
Revert "Polyfill dataresult"
This reverts commit e3df0d82e0.
2024-01-01 17:30:48 +07:00
4c5c2362ce
Merge branch '1.20.2' into 1.20.1 2024-01-01 17:29:28 +07:00
e3df0d82e0
Polyfill dataresult 2024-01-01 17:28:46 +07:00
0a5ae54614
Some backporting 2024-01-01 17:18:57 +07:00
45dd3e5c4b
Downgrade dependencies 2024-01-01 17:02:19 +07:00
5ad9d49537
Merge branch '1.20.1' into 1.19.4 2024-01-01 16:51:04 +07:00
54fa8a252e
Merge branch '1.20.2' into 1.20.1 2024-01-01 16:51:04 +07:00
18965ccfc7
god damn it 2024-01-01 16:50:37 +07:00
4e3ca82fc7
Destroy cables on piston push instead of block 2024-01-01 16:43:11 +07:00
d84af00876
Merge branch '1.20.1' into 1.19.4 2024-01-01 16:41:39 +07:00
a9cb2db3b4
Merge branch '1.20.2' into 1.20.1 2024-01-01 16:38:01 +07:00
64b8346424
Specify proper piston push behavior for most blocks 2024-01-01 16:37:42 +07:00
6dbd942626
Merge branch 'master' into 1.19.4 2024-01-01 15:47:20 +07:00
748a232569
Merge branch 'master' into 1.20.1 2024-01-01 15:45:06 +07:00
50112bfbaf
Don't make cables seem to be interactable 2024-01-01 15:00:50 +07:00
da4c1108c2
Fix slot panel quick move display 2024-01-01 14:45:37 +07:00
8e469c309d
Make datagen run? 2024-01-01 14:23:28 +07:00
f3bf84a7a2
Make mod compile against 1.19.4 2024-01-01 12:19:07 +07:00
b6643a6dd3
Make main source set compile against 1.19.4 2024-01-01 12:10:02 +07:00
31268e33ef
Merge branch 'master' into 1.19.4 2024-01-01 12:01:33 +07:00
86c426a504
Merge branch 'master' into 1.20.1 2024-01-01 11:45:14 +07:00
3db63aa589
Add MatteryContainer.ContainerListener 2024-01-01 11:45:06 +07:00
afe7d698c8
More backporting 2024-01-01 11:39:30 +07:00
0bcc078fe9
More backporting 2024-01-01 11:19:20 +07:00
e3e02dbad2
More backporting 2024-01-01 03:28:59 +07:00
e563b85946
Some backporting 2024-01-01 03:22:05 +07:00
cc82146f0a
Remove import 2024-01-01 03:00:55 +07:00
108b49bedb
Merge branch 'master' into 1.20.1 2024-01-01 02:55:55 +07:00
716d251ca0
More MGUIGraphics moves 2024-01-01 02:51:54 +07:00
1dab485d29
Specify font implicitly 2024-01-01 02:46:00 +07:00
d81d7885c0
And move it to render subpackage 2024-01-01 02:40:58 +07:00
311de079fa
Add polyfill guigraphics 2024-01-01 02:39:58 +07:00
71850b38e5
Merge branch 'master' into 1.20.1 2024-01-01 00:58:18 +07:00
2e23ce1a04
One more isCancelable 2024-01-01 00:58:17 +07:00
796f29127f
Merge branch 'master' into 1.20.1 2024-01-01 00:13:22 +07:00
75681fb4c4
Specify isCancelable directly 2024-01-01 00:13:15 +07:00
8c43a3ec6d
Merge branch 'master' into 1.20.1 2023-12-31 23:18:46 +07:00
023ad54b33
Various fixes related to number handling 2023-12-31 23:18:23 +07:00
477e782c7c
*french disappointment* 2023-12-31 22:44:28 +07:00
65cf8bf9df
Fixes to data loading 2023-12-31 22:43:02 +07:00
e5a982ae13
Caused by: java.lang.invoke.LambdaConversionException: Invalid receiver type int; not a subtype of implementation type class java.lang.Integer 2023-12-31 22:25:55 +07:00
f942093e4f
Don't embed condition json by default 2023-12-31 22:23:16 +07:00
5d15611f84
Update mods.toml 2023-12-31 22:20:48 +07:00
1803d687ab
Make mod compile against 1.20.1 2023-12-31 22:18:43 +07:00
347be35184
Make main source set compile 2023-12-31 22:08:15 +07:00
aa0a283e06
More backporting 2023-12-31 21:40:54 +07:00
98fcacc9a8
More backporting 2023-12-31 21:14:32 +07:00
422ae92303
More backporting 2023-12-31 21:02:52 +07:00
7683cacc29
More backporting 2023-12-31 20:42:20 +07:00
520112df77
Backport MCriterionTrigger to 1.20.1 2023-12-31 20:29:57 +07:00
5453c8c793
Merge branch 'master' into 1.20.1 2023-12-31 20:25:03 +07:00
1681a7bf4a
Streamline trigger instances into single, more portable class 2023-12-31 20:23:45 +07:00
3c5ea937a5
More backporting 2023-12-31 18:23:07 +07:00
f16483d7c0
Some recipe backporting 2023-12-31 17:46:56 +07:00
8072a7b135
Don't check for "chunk send" status because it is already sent during event fire 2023-12-31 17:08:45 +07:00
242876d533
Migrate to custom network context 2023-12-31 17:01:57 +07:00
be52bbdc59
Fix not accounting initial cable node limit when transfering energy 2023-12-31 10:53:55 +07:00
6be24540a5
Don't remove self from lively nodes when all we can do is self-feed 2023-12-31 10:29:27 +07:00
a162caefb6
Use pecrentage function 2023-12-31 10:07:44 +07:00
8d222125b5
Specify max battery of cables as positive infinity 2023-12-31 09:41:03 +07:00
1c0cdb8b5b
Energy cable tiers, fix some Client -> Server logic leaks in singleplayer 2023-12-30 20:26:31 +07:00
023081eaaa
Fix accidental LIFO order on tick list when queueing ticks (when it always should be FIFO) 2023-12-30 19:57:21 +07:00
7c9657c6d2
Get rid of block entity specific onceLevel 2023-12-29 16:43:28 +07:00
d5f1d3cde0
e 2023-12-29 16:41:56 +07:00
35e0bc65da
Add more specifics to cable energy cap 2023-12-29 16:39:19 +07:00
79aeca5720
Energy cables test 2023-12-29 16:35:32 +07:00
6de2f14fcd
Update energy impls to make more use of infinity 2023-12-29 10:52:01 +07:00
2276f0ef45
Fix zero decimal formatting 2023-12-29 10:51:13 +07:00
a1515d54c4
Introduce infinity to energy impl, move creative battery to plain infinite values instead of special logic 2023-12-28 20:37:18 +07:00
f13c725298
Concept of infinity, for Decimals 2023-12-28 20:13:03 +07:00
6784271ac7
Fix shapegen for storage bus 2023-12-28 19:59:15 +07:00
93942161ad
Fold cables block code 2023-12-28 15:03:13 +07:00
d7c5b76098
Bump required kotlin to 1.9 2023-12-25 11:40:15 +07:00
a5dcf5a331
Fix field synchronizer set not reacting properly to global markDirty() 2023-12-23 19:42:38 +07:00
1e2c505fbd
Unify experience storage in machines, Liquid XP 2023-12-22 20:08:12 +07:00
8fece2a517
Move capabilities impls to subpackages 2023-12-22 14:53:25 +07:00
9eeb4c2190
Use global constant instead of handwritten number 2023-12-22 14:51:05 +07:00
29cb78bbd5
Remove frame title from exopack inventory screen 2023-12-22 14:42:58 +07:00
19bb6600dd
Bump KFF and Forge 2023-12-22 14:27:41 +07:00
6fb6687cd0
Update block entity synchronization to match 1.20.2 chunk queue changes 2023-11-17 13:19:17 +07:00
db6b5e7efc
Get rid of savetable() 2023-11-17 12:29:32 +07:00
6737d52c10
Update previous commit 2023-11-17 10:18:41 +07:00
940d8333de
Handle vanilla-like trim cloning recipes 2023-11-16 21:44:20 +07:00
280a8f3431
Merge painter recipe types 2023-11-16 21:29:19 +07:00
b26f109f56
Painter Recipes updates 2023-11-16 21:02:19 +07:00
6d21760621
essence storage mending repair (with automation) 2023-11-16 16:36:41 +03:00
8dcf484362
smoother ability cooldown display (rubberbanding due to late sync) 2023-11-16 13:28:15 +03:00
f13f9481ea
smoother shield cooldown display 2023-11-16 13:10:16 +03:00
41fa744d4a
universal wireless charger 2023-11-15 02:25:15 +03:00
993b1ac0fc
extremely fast archaeology 2023-11-15 02:13:30 +03:00
a618436ddd
fix android charger not using battery from its own slot 2023-11-14 13:29:59 +03:00
574d3721b1
YuRaNnNzZZ — Вчера, в 18:38
можно зарядник ещё и на экзопак расширить
2023-11-14 13:19:36 +03:00
8a6e8afa61
machine upgrades 2023-11-13 21:54:10 +03:00
586c43fd6c
hud text scale + reorganize client config 2023-11-04 13:39:08 +03:00
122ebb9688
cheaper/more proper checkerboard background render (still bad)
:trolley:
2023-11-02 02:22:25 +03:00
ee700c442e
undo dye bar static non-dye background color 2023-10-31 22:36:59 +03:00
b130d69da1
better paint bars background 2023-10-31 22:09:46 +03:00
8e3c95159a
display painter recipe name in advanced tooltips 2023-10-30 22:40:07 +03:00
0d474e1991
handle icon color in itemstack icon buttons 2023-10-30 22:38:48 +03:00
92a9fa39df
darken icons in disabled/pressed buttons 2023-10-30 22:38:18 +03:00
608771f441
DBot — Сегодня, в 16:11
добавь margin сверху у кнопки массовой покраски
или у списка снизу
2023-10-30 16:53:21 +03:00
94e1ce6d8e
paint and remove armor dye in painting table 2023-10-30 15:57:39 +03:00
6c9058e72d
darken base tritanium armor color 2023-10-30 12:54:53 +03:00
6aaad2fe88
покраска тритановой брони
#178 :WiseTree:
2023-10-30 12:41:25 +03:00
9d882d2351
draw shields cooldown 2023-10-30 08:30:30 +03:00
55363f5f6a
secondary recipes for powered furnaces + microwaving pattern drives to erase them 2023-10-29 18:41:20 +03:00
c4a5653330
actually add upgrade slots 💀 2023-10-29 01:51:31 +03:00
f3da82beaf
furnaces and plate presses now store experience into essence storage on job finish and neighbour block update 2023-10-29 01:25:54 +03:00
814328630c
fix upgrades not saving in matter decomposer and scanner; added upgrades to bottler and recycler 2023-10-29 00:42:48 +03:00
0bf5ec5487
Пойти нахуй 2023-10-28 06:43:25 +03:00
d7794320fa
jade update 2023-10-27 16:39:34 +03:00
e116f0cd6e
change crafting table tag to a widely used one 2023-10-27 13:48:02 +03:00
83502eb240
we do a little trolling 2023-10-27 02:57:01 +03:00
bc8a52acd4
add portable gravitation stabilizer to chestplates tag 2023-10-27 01:11:37 +03:00
44bf3cca43
remove freeze protection mixin in favor of minecraft tag 2023-10-27 00:57:58 +03:00
c79f686e41
organize tags 2023-10-27 00:57:10 +03:00
87d9df1ce1
equipment slots emit eqiup sound 2023-10-26 22:21:11 +03:00
0e83e08ec6
manual hammer priming 2023-10-26 17:01:36 +03:00
636afe639e
Painter table water ingredient, semi-realistic color mixing 2023-10-26 20:51:26 +07:00
474a19a30b
Make painter table reflect reality (real life colors are mixed subtractively) 2023-10-26 18:52:30 +07:00
171e16a7c4
Remove Mekanism compat since it will not be updated to newer versions 2023-10-26 18:44:03 +07:00
15023b6599
upgrade minecarts as well 2023-10-26 10:21:06 +03:00
cf45fe69c5
DBot — Сегодня, в 8:52
Напомнил
Что ящик должен агрить пиглинов
Ибо они агрятся даже на ендер сундук
И это by design
2023-10-26 09:10:48 +03:00
1f72cd865c
emit events and particles on chest upgrade 2023-10-26 08:53:53 +03:00