Commit Graph

2457 Commits

Author SHA1 Message Date
5aa52383d8
Merge remote-tracking branch 'origin/master' into master 2023-07-25 14:25:18 +07:00
8a78b299c5
Revamp job event loops, move jobs to codecs
Add PatternState codecs
Add ReplicationTask codecs
Instead of returning job status on job tick, now downstream code directly update status of provided job status object
Make Matter Replicator and Matter Recycler not do full stop when there is not enough matter/nowhere to put matter
2023-07-25 14:19:35 +07:00
e518f2c732
рендер шизы
(или жидкостях в танках-предметах)
#258
2023-07-25 05:58:32 +03:00
28801252fa
display i/o in jade for profiled storage (energy and matter)
closes #270
2023-07-24 21:40:35 +03:00
d4fb6d0b24
Make androids immune to synesthesia and plague from Rats mod 2023-07-24 09:44:13 +07:00
ef2c89ea0a
Merge remote-tracking branch 'origin/master' into master 2023-07-24 09:39:23 +07:00
8407ae1328
Cache text width when aligning it multiple times 2023-07-24 09:35:14 +07:00
e9793037bd
added harvest tool tag for metal junk and metal mesh (#275) 2023-07-24 04:20:08 +03:00
699b4e896c
Im blind 2023-07-24 00:53:57 +07:00
6dccbd5bfa
...unless you are in gui 2023-07-24 00:48:00 +07:00
e7c2f71022
Outline singularity text instead of dropping shadow 2023-07-24 00:44:32 +07:00
a161549392
positive Z is pointing from viewer 2023-07-24 00:43:04 +07:00
9744269ac6
GabeN :wtf: 2023-07-24 00:41:18 +07:00
00c3f17dd2
Add text outlining to hud values 2023-07-24 00:32:15 +07:00
e9f982eb6b
Redo text rendering as single function and revisit render gravity 2023-07-23 23:59:55 +07:00
a2f5f72aa8
Update config values for matter recycler block entity 2023-07-23 18:22:30 +07:00
636f99740a
Allow to undefine work speed in config value 2023-07-23 18:22:26 +07:00
7ba96185e5
Make ObservedConfigValue implement GetterSetter 2023-07-23 17:56:14 +07:00
ad54cfeb9b
Reflect new tritanium block recipe in advancement tree 2023-07-23 17:43:09 +07:00
8c83cce40d
Add close buttons to matter task monitor 2023-07-23 16:56:49 +07:00
7eec1c7032
Don't allow to prime primed hammer 2023-07-23 16:02:59 +07:00
94acd58516
Add exopack upgrades to recipe catalysts 2023-07-23 14:46:48 +07:00
478503e727
Update default plate press config values, and allow consumption and work speed to be configured 2023-07-23 13:04:04 +07:00
be802d1674
Balance furnace inputs before ticking jobs 2023-07-22 20:31:53 +07:00
8f76e1455b
мда 2023-07-22 15:07:35 +07:00
dc2661db9a
Fix quick move not displaying proper item counts 2023-07-22 12:31:58 +07:00
c887025a6c
Fix when Mattery energy is exposed as Mekanism energy it ignore energy flow direction
Just like Mekanism for a long time ignored throughput limits when something charge its items through Forge Energy
2023-07-22 12:05:41 +07:00
d2c2fbd3d2
Fix crash related to tracking mekanism energy 2023-07-22 11:58:24 +07:00
e8d7f0225c
Don't check for energy flow when working with mekanism energy 2023-07-22 11:58:23 +07:00
1ff20b090f *Collapses* 2023-07-22 05:47:43 +06:00
b2e50a6c1b
Fix mekanism energy getting above potential IMatteryEnergyStorage 2023-07-21 21:40:15 +07:00
ca32929f3c
New furnaces shapes 2023-07-21 21:31:49 +07:00
7e0ea033b4
Merge remote-tracking branch 'origin/master' into master 2023-07-21 21:25:25 +07:00
93696261e4
Prevent cargo crate dupe 2023-07-21 21:11:11 +07:00
58b9ea33e4
Add jei catalysts for new furnaces 2023-07-21 20:47:43 +07:00
19e205b527 Furnaces 2023-07-21 17:53:25 +06:00
90ae56dbdc Matter upgrades texture (not implemented) 2023-07-21 02:54:39 +06:00
8d4e0d83ee Electric furnace model (Looks broken atm, TODO: fix it) 2023-07-21 02:52:59 +06:00
77a619cba6
Add worker blockstate to powered furnaces 2023-07-20 18:24:38 +07:00
436d324b50
Less generous recipe for blast furnace, update microwave recipe 2023-07-20 18:17:48 +07:00
e1681a5c6f
recipes for new machines 2023-07-20 18:09:30 +07:00
5659fb2040
YuRaNnNzZZ прокомментировал(а) 1 день назад
электрическая печь - furnace
индукционная печь - blast furnace
микроволновка - smoker
2023-07-20 17:58:14 +07:00
1f1b6e5f59
Powered Furnace, Blast Furnace, Smoker 2023-07-20 17:27:01 +07:00
54bc1bdd40
plasma projectile render 2023-07-20 02:05:33 +03:00
7f22b1e175
block sweeping edge enchantment for energy sword 2023-07-20 01:34:15 +03:00
ecb68ec36f
Make matter reconstructor push excess matter back into network 2023-07-19 21:29:27 +07:00
b3e6caf5ba
Matter replicator failsafe upgrades support 2023-07-19 21:26:33 +07:00
ab51740ddf
Matter reconstructor upgrades support 2023-07-19 21:26:22 +07:00
9cd5bad152
If we are ticking normally, don't use global tick handler to send blockentity changes to players 2023-07-19 18:43:26 +07:00
135dcb667d
Fix matter replicator losing upgrades 2023-07-19 18:39:30 +07:00
2095055e73
Add matter capacity upgrade 2023-07-19 18:30:35 +07:00
91d0f5a65b
I forgor to add replicator upgrades to its menu 💀 2023-07-19 17:32:33 +07:00
31cb9973d5
Shortcut when trying to receive/extract zero matter 2023-07-19 17:18:02 +07:00
d534ebbbf2
GabeN 2023-07-19 17:17:45 +07:00
12cd0b758c
Merge remote-tracking branch 'origin/master' into master 2023-07-19 17:14:54 +07:00
41b5b1a57b
Even more ComputeAction/Constant codecs 2023-07-19 17:14:45 +07:00
47feee8425
Fix blacklist action were not properly serialized 2023-07-19 17:06:39 +07:00
03c12c5737
do use recipe_type for crafting recipe finder
for things like create mechanical crafting support
2023-07-19 11:24:52 +03:00
bd34ad8d3b
replicator return unused matter back to network 2023-07-19 09:28:35 +03:00
3aaa595d7b
Merge remote-tracking branch 'origin/master' into master 2023-07-19 11:34:12 +07:00
fe870bd4a8
Send matter back into network when not working, inside matter replicator 2023-07-19 11:29:07 +07:00
b00d275d0f
Add upgrades to matter replicator 2023-07-19 11:27:10 +07:00
ec8aa1330c
YuRaNnNzZZ — Сегодня, в 6:06
а где.
2023-07-19 06:20:33 +03:00
cc31b6e4bb
pattern monitor pattern advanced tooltip lines 2023-07-19 05:51:59 +03:00
824d75a680
highlight selected enum in tooltips 2023-07-19 05:06:33 +03:00
5c2791c30c
matter scanner visual progress 2023-07-19 04:42:58 +03:00
18a10e1f6c
round down scan percent 2023-07-19 03:13:33 +03:00
ab7e416453
draw research and replication progress in pattern monitor 2023-07-19 02:27:10 +03:00
3b57dcb599
ты кому звонишь 2023-07-19 02:12:03 +03:00
035c3edcad
Make plate press accept processing upgrade 2023-07-18 21:14:06 +07:00
9758a3474c
Fix processing upgrade showing two plus signs in description 2023-07-18 21:13:51 +07:00
cc9d2ef4eb
Move matter registry to codecs, simplify manual writing of matter json files 2023-07-18 20:36:01 +07:00
667e074362
Expose help and close buttons as properties 2023-07-18 13:39:09 +07:00
bafe74ea24
Move quicksearch bar in pattern monitor to not overlap close button 2023-07-18 13:37:16 +07:00
1ee071bfdb
Build creative mode tabs contents when it is not built when using creativetabsorter 2023-07-18 13:32:02 +07:00
c6117e659d
Don't process android ability key logic if we are a spectator
server already ignores feature activation if we are a spectator
2023-07-18 13:19:03 +07:00
15f53ea124
Don't display "slot charging" help if player has no exopack 2023-07-18 13:02:01 +07:00
dc50a79b20
Merge remote-tracking branch 'origin/master' into master
# Conflicts:
#	src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt
#	src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt
2023-07-18 12:04:13 +07:00
a707e49b8c
Exopack coloring and toggle exopack glowing 2023-07-18 01:55:17 +07:00
25875b162e
Improve blocker flashing 2023-07-18 01:54:21 +07:00
0e9a480dd8
Make checkboxes accept GetterSetter as checking property 2023-07-18 00:57:24 +07:00
687b5c9726
Move extension functions to interface itself, add box() GetterSetter 2023-07-18 00:56:16 +07:00
6a5924267a
Make callback be mutable property 2023-07-18 00:52:42 +07:00
67c54357e8
bump forge to recommended build 2023-07-15 22:48:14 +03:00
d0334e761d
better colors for jade bars 2023-07-15 21:02:47 +03:00
4daa0be19a
Color picker panel 2023-07-15 19:41:31 +07:00
9394de61d9
Make TextInputPanel obey acceptsCharacter when pasting from clipboard 2023-07-15 19:40:11 +07:00
9fe8d1734e
Add RGBAColor stream codecs 2023-07-15 19:39:38 +07:00
04f58c01db
Add HSVColor, massively overhaul RGBAColor class 2023-07-15 19:39:25 +07:00
d855234808
Add panel children sorting 2023-07-15 19:38:53 +07:00
c71a1ab0d6
Open FramePanel's title getter/setter to public 2023-07-15 19:37:56 +07:00
57b2b64ff9
Add custom position/tex/color shader without fragment discarding 2023-07-15 19:35:38 +07:00
f5a9e98c6f
Add codec to savetables 2023-07-15 19:35:11 +07:00
f2e4c80d31
jade compat
DBot — Сегодня, в 6:21
Не думай.
2023-07-15 07:48:59 +03:00
027d6ef65f
exopack curios inventory button 2023-07-14 22:25:48 +03:00
6105ca797b
If it ever happens, avoid dividing by zero 2023-07-12 14:41:40 +07:00
203f4e56c9
YuRaNnNzZZ — Вчера, в 20:54
мне кажется надо задать максимальный размер стака 1 в банках
:WiseTree:
2023-07-11 19:02:32 +03:00
30fdd2fd28
procedural battery energy bar 2023-07-11 18:57:15 +03:00
37974d40b9
Refine render methods and functions 2023-07-10 21:48:59 +07:00
0444568c64
YuRaNnNzZZ — Сегодня, в 18:42
убери нахуй курио слоты из экзопака
2023-07-10 18:44:43 +07:00