Commit Graph

755 Commits

Author SHA1 Message Date
1e48b00c2a
kot 2023-02-25 21:38:10 +07:00
3f25afd9d9
Tritanium anvil, bars, shears, shield, nuggets 2023-02-25 20:25:26 +07:00
504033b65e
not so good attempt at improving clarity of configuration menu 2023-02-21 16:10:58 +07:00
3b53d65b29
Configurable energy handler working 2023-02-21 09:13:31 +07:00
3f8cf5abe6
Move slash in texture 1 pixel up 2023-02-19 01:08:56 +07:00
a54d2f940f
A lot of stuff related to configurable devices sides 2023-02-19 01:06:09 +07:00
faa64a47c3
Proper phantoms spawn hook 2023-02-10 21:23:45 +07:00
3a82981341
⚙ SHOCKY — Сегодня, в 20:42
что не так.
...
2023-02-10 20:43:12 +07:00
e20fc1274c
Fix widgets 2023-01-31 15:56:46 +07:00
6390857959
Split widgets_18 to several files 2023-01-31 13:45:08 +07:00
bfcb941f0f Merge remote-tracking branch 'origin/master' 2023-01-30 23:03:32 +06:00
ae75a05e64 Fix funny z-fighting on holo signs 2023-01-30 23:03:04 +06:00
7d5b63f38e
Redstone control button, sanitize EnumRectangleButtonPanel, EnumInputWithFeedback 2023-01-30 23:19:58 +07:00
fb1117907a
Matter panel now requires tritanium plates 2023-01-29 21:07:18 +07:00
46f0b1bf59
Fix scroll bar constants 2023-01-29 20:31:35 +07:00
903cb30c8e
Exiark - Let There Be Light (feat. Chi-Chi) 2023-01-28 18:29:07 +07:00
ad2ab7e10a
Add battery models which are no longer datagened 2023-01-28 18:24:05 +07:00
2a8d08c357 holo-sign model is in but for some reason lights rendering is odd 2023-01-27 05:15:15 +06:00
8ba2ef8b95 matter-bottled 2023-01-24 12:43:05 +06:00
47f95975e5
Actually make tritanium armor require full set to stop freezing instead 2023-01-23 22:09:33 +07:00
740ae89ab2
Add tritanium armor to freeze immune tag 2023-01-23 22:02:03 +07:00
51c35d6142
Fix engine model not being parented to cube_all 2023-01-14 22:51:17 +07:00
03755ccaa4 engine model 2023-01-14 17:18:38 +06:00
0c01a7cdaf
Update signature of renderLevel in coremod 2023-01-13 23:37:28 +07:00
4c419aaf35
Update tritanium ore biome modifier 2023-01-13 22:08:42 +07:00
27c0f2274f
remove widget atlas from coremod injection 2023-01-13 17:29:22 +07:00
d403726d54
Update leaveBedButton SRG name 2023-01-13 16:44:21 +07:00
5693ca266e
Mattery atlas, update all atlas assets 2023-01-13 16:35:33 +07:00
de1295abc6 Fuck 2022-12-02 03:33:45 +06:00
ef415b9898 Fixed some textures;
Texture updates: Matter replicator, pattern monitor;
Fixed UVs for Matter Replicator armatures;
2022-12-02 03:31:41 +06:00
b3b858233d Pattern storage and matter scanner textures update 2022-11-28 03:55:15 +06:00
0b31085dc6
door.
Fixes #177
2022-11-27 13:02:08 +07:00
2e55e256d6
tritanium d00r, painted
related to #177
2022-11-27 00:16:27 +07:00
e811a66119
Wither boss is now neutral to android players
Fixes #207
2022-11-24 23:23:19 +07:00
6ead1cfaf5 Let there be light. (For batteries) 2022-11-24 19:01:07 +06:00
768bd83920 Matter decomposer texture update; Why is this widget colored like that 2022-11-24 18:33:13 +06:00
d539042e29 Better battery bank plug; Battery/matter banks and android station texture updates 2022-11-24 16:37:45 +06:00
310823055b Fix Гиршок какого чёрта 2022-11-21 01:03:29 +06:00
fa536734c2
Merge remote-tracking branch 'origin/master' into master 2022-11-13 17:00:21 +07:00
9592860349
Un-tangle matter system 2022-11-12 23:54:29 +07:00
37e4f33af6
Compute action, more matter values 2022-11-12 12:31:43 +07:00
c07c9e7aaa
Add plate press recipes to recipe resolver 2022-11-09 20:09:03 +07:00
a14a702f39
New recipe resolver, json based 2022-11-05 01:09:14 +07:00
df14e1b449
Update pack mcmeta 2022-11-02 23:42:13 +07:00
3ee445a1fd Tritanium dust texture 2022-11-01 01:44:56 +06:00
adf351c6af
forgot kot for dust 2022-10-29 18:31:00 +03:00
dbf4be9f6c Ocean container??? 2022-10-27 21:59:14 +06:00
606309a962 Fuck 2022-10-27 17:19:51 +06:00
3e291ff340 Merge remote-tracking branch 'origin/master' 2022-10-27 17:12:28 +06:00
ab2e31adee Fix No starting jigsaw overdrive_that_matters:frigate_anchor found in start pool overdrive_that_matters:frigate 2022-10-27 16:51:07 +06:00
91fab0848f
Buff machine frame recipe 2022-10-26 21:32:52 +07:00
32b8215435
Fix android glitch cause horizon to render black
Fixes #162
2022-10-25 18:23:25 +07:00
4d551a2df9
Bows now can use arrows from exosuit inventory
Fixes #172
2022-10-25 16:35:12 +07:00
2287c74ed9 Base textures for colored doors 2022-10-24 15:12:55 +06:00
06ada43c75 Exosuit color texture 2022-10-24 15:09:36 +06:00
99513ecc04
Merge remote-tracking branch 'origin/master' into master 2022-10-23 12:32:41 +07:00
6cd29403be
thirty two bits 2022-10-23 12:01:25 +07:00
a6e0778d49
я ненавижу каждую секунду видения этого. 2022-10-22 23:38:17 +07:00
18b62dff42 Laboratory Tele jigsaw worldgenjson error fix and alternative entrance structure variants 2022-10-22 18:19:41 +06:00
40cfb030c2
Rename 2022-10-22 12:28:46 +07:00
d6250f4cb2
Revert shockwave sound to ultrakill one
Because we now have permission from copyright holder
2022-10-22 01:11:23 +07:00
a53438e1f9
Exosuit display toggle button 2022-10-21 22:44:12 +07:00
834efad363
Proper exosuit model 2022-10-21 20:08:19 +07:00
5a70c22acc
Put in more sane values 2022-10-21 13:30:29 +07:00
920ae7b2b2
formatting 2022-10-21 13:16:23 +07:00
d2257749e0
Inventory scrollbar in all inventories
Fixes #120
2022-10-20 20:59:04 +07:00
c44d36fbfe Minor texture changes for floor tiles 2022-10-18 23:11:38 +06:00
8e91e2564e
shockwaive 2022-10-17 23:32:34 +07:00
333f268228
а вот и звуки 2022-10-17 11:48:45 +03:00
c64270c75e Shockwave and jump boost sound files? (not implemented) 2022-10-17 12:56:07 +06:00
3ead1c998d
Android glitch effect or something
Fixes #116
2022-10-15 23:34:06 +07:00
29abf5f071
Get post render hooks working at least 2022-10-14 22:23:05 +07:00
89ae6e9f2c Exosuit texture; Updated cosmetic thrusters for tritanium armor. 2022-10-14 14:38:01 +06:00
dd7c54eadb More Laboratory rooms; Laboratory rooms weight changes; An alternative variant for a frigate; 2022-10-14 02:10:43 +06:00
4de6be0289
⏱️
отображение применяемой способности и её статус при нажатии кнопки (#123)
2022-10-13 10:00:44 +03:00
3fa0933ac8
Show teleportation location and phase-through blocks 2022-10-13 07:51:46 +07:00
9570511d8a
Checkboxes now have all button variants, and behave like buttons
Fixes #123
2022-10-12 22:32:17 +07:00
b501efc515
Make slots appear to mods at "proper" positions 2022-10-12 21:45:16 +07:00
994058b187
Add pickItem hook for exosuit inventory
Fixes #93
2022-10-12 09:23:27 +07:00
ba52af00fb
Add all missing inventory hooks
Fixes #110
2022-10-11 19:51:00 +07:00
fdc1c9b671 Laboratory now has an entrance point; New structure: Cargo frigate! (Practically empty in terms of resources for now other than some iron ore blocks in cargo containers) 2022-10-11 01:21:20 +06:00
63715823ca
Get rid of mutablematrix 2022-10-11 00:38:46 +07:00
6cee8e4acf
Get rid of top hook declaration 2022-10-10 23:18:18 +07:00
24cb22abf8 UNDERGROUND LABORATORY STRUCTURE LETS GOOO 2022-10-10 02:35:34 +06:00
6c2f5a6f48 Ok i give up i can't please oh god dammit FUCK 2022-10-09 02:56:59 +06:00
aa0ac9a78f Structure test update 2022-10-08 23:38:30 +06:00
c1bdfdd1f6 Cargo crates should now "glow" 2022-10-08 22:26:26 +06:00
159b5184ae Structures test again (2) 2022-10-08 21:12:23 +06:00
a3173def89 Structures test again 2022-10-08 21:11:45 +06:00
13d5aae33b
Use atlas for android research icons, again 2022-10-08 16:09:04 +07:00
ae1514700b
Combine android charge bars 2022-10-08 14:34:00 +07:00
8ab76cd499
Fix weird slim scrollbar 2022-10-08 14:28:32 +07:00
980e2a8f30
Optimize atlas skin element
Achieved with CryCry 3
2022-10-08 14:17:50 +07:00
1c30ce7e8a
DynamicBufferSource battle test 2022-10-08 13:29:16 +07:00
e3a550778f
Split widgets to separate files 2022-10-07 19:50:00 +07:00
b400b0a7aa
power of two 2022-10-07 18:16:09 +07:00
6f206bf02e
Scrollbar textures split 2022-10-07 13:18:35 +07:00
be8435655f
Split android gui atlas to separate files 2022-10-07 00:46:28 +07:00
f99ed19d9c
Atlas variant for skin element
Fixes #99
2022-10-06 23:41:08 +07:00
6e41f338d3
README and LICENSE 2022-10-05 18:12:55 +07:00
30b739f9ce
Tritanium slabs and walls 2022-10-05 14:53:28 +07:00
987d6df934 Some Xblxa xa changes; Android station idle model fix; Tritanium ingot block texture; Tritanium trapdoor texture (Dbot do the thing) 2022-10-05 03:50:09 +06:00
92db60d73e
Basic matter replicator graphics 2022-10-04 23:06:42 +07:00
8195b80d3a
Merge remote-tracking branch 'origin/master' into master 2022-10-02 17:41:26 +07:00
4212345bd8
Return node after finishing transform 2022-10-02 12:18:22 +07:00
7c7bbb0dbe Electricity effect around energy sword now GLOWS!!!! ! Energy servo multipart model testing that i successfully failed; A little change to attack boost icon; Android station now GLOWS TOO!!! 2022-10-02 06:03:05 +06:00
9c41d740b2
Energy sword now correctly display whenever is it powered
Fixes #89
2022-10-01 23:43:01 +07:00
c4d683fe7b
Energy sword now has innate sweeping edge mechanics
Fixes #54
2022-10-01 20:39:57 +07:00
d31b692f94
Hook directly into Inventory#add using coremod
Fixes #43
2022-10-01 19:43:22 +07:00
3bfb247b2c Fixed Phantom attractor item display; Added energy servo model; Yet another change in android upgrades texture atals. 2022-10-01 01:34:48 +06:00
f4853ce09d
Bump forge to 43.1.32 2022-09-30 22:38:33 +07:00
653a0e2b77 Handpainted matter dust xblxa xa 2022-09-30 04:59:42 +06:00
ce364663b6 Tritanium door item texture 2022-09-30 04:48:56 +06:00
aa01fc0f2c More android upgrade icons changes 2022-09-30 04:38:40 +06:00
aecc4b9cd6 Look at this item to see the coolest person in the world 2022-09-30 03:29:13 +06:00
c02ad15530 Made electromagnet look less like a cyberware augmentation. 2022-09-30 03:22:03 +06:00
7b01d94715 Since battery/matter banks now display their actual capacity, the "lights" are now off. 2022-09-30 03:17:14 +06:00
1cd36986f3 Phantom attractor + android upgrade icons update??? 2022-09-29 20:23:38 +06:00
fa2ffe02d4
DBotThePony — Сегодня, в 4:01
Просто если обе текстуры имеют нормальную прозрачность, но на выходе получается странная вещь, то можно было бы выставить -channel rgb перед -compose
2022-09-29 04:04:08 +03:00
494cb61bd4
generated colored cargo crate minecarts, un-kot omnipresent pattern drive
and copy opacity from source texture in the colorizer
2022-09-29 03:17:19 +03:00
a775170c92
УБИВАТЬ 2022-09-29 02:17:52 +03:00
baea387ac7 хыха дверь 2022-09-29 01:47:07 +06:00
d2c46791fc Cargo crate minecart item textures Xblxa xa 2022-09-29 01:39:00 +06:00
a5f9281214 Oops, I dropped some green paint into our matter pool! Also: Electromagnet, Quantum transceiver, Gold plate, Omnipresent pattern drive textures! Also: Updated textures for some components + new plates! 2022-09-29 01:35:23 +06:00
bb689a39eb
Analog scroll bar, slim scroll bar, canvas scroll panel 2022-09-29 00:04:18 +07:00
b4b0afa9d5
Housekeep remaining tags, correct recipes 2022-09-26 16:14:28 +07:00
0b0e6a18b6
Remove LFS 2022-09-26 13:26:23 +07:00
2e86f2b599
Lab lamp recipe, hardened glass tags 2022-09-25 22:36:37 +07:00
b1e0fce1fa
Electromagnet item 2022-09-25 21:47:30 +07:00
46819e82c6
Items requirement for research, gold plates 2022-09-25 18:42:10 +07:00
26ebf1b3b2
Some unifications in tooltip handling
Fixes #74
2022-09-13 00:10:06 +07:00
d95254c575 Exosuit upgrade item textures 2022-09-11 21:42:13 +06:00
4beb660080
Cargo crate open sound
Fixes #41
2022-09-11 21:31:24 +07:00
605ca37c30
Sounds datagen 2022-09-11 19:12:02 +07:00
d66f892d9e
Inventory rows height test 2022-09-09 17:53:45 +07:00
71f0bf3a62
Buttons now have proper isDisabled, regular button is now native panel
Fixes #8
2022-09-09 15:22:11 +07:00
b2b128f93a Haha, metal beam, danger stripe and lab lamp textures 2022-09-09 00:27:16 +06:00
70255794a8
Laboratory Lamp, Danger Stripe Block, Metal Beam
#70
2022-09-09 00:26:13 +07:00
5946413b7a
Container crates, but with all colors 2022-09-08 19:14:33 +07:00
b617bf0c25
Refactor decorative blocks class 2022-09-08 18:22:03 +07:00
fcbe68297c
Button to go back to vanilla inventory screen 2022-09-07 14:22:14 +07: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
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
4a6fd46114
Add GearShocky to authors 2022-09-06 07:32:30 +07:00
77e35917ba
Even better bed button handling 2022-09-06 00:17:23 +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
80a576f6a7 FLOOR TILES YEEEE- 2022-09-05 15:13:17 +06:00
ea19ab856f FLOOR TILES (white) UPDATE WOOOOOOOOOOO- 2022-09-05 15:10:03 +06: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
4babe703c7
BackgroundPanel and better power bar position in item monitor 2022-09-05 00:31:46 +07:00
ae8a9296f7
Power consumption by android station when doing stuff in it 2022-09-04 16:19:46 +07:00
00b8e546b0 Merge branch 'master' of https://git.dbotthepony.ru/DBot/overdrive_that_matters 2022-09-03 17:43:26 +06:00
37234e6503
Refactor widgets atlas 2022-09-02 15:59:01 +07:00
ea701e70c9
Fix plate press recipe 2022-09-01 21:20:15 +07:00
cac5f399e4 Idiot moment 2022-09-01 18:02:39 +06:00
37c8dd039c Matter capacitor bank frame model update 2022-09-01 17:59:36 +06:00
4596219800 sword 2d/3d views restored (attempt 3) 2022-09-01 15:22:04 +06:00
30627a750a sword 2d/3d views restored (attempt 2) 2022-09-01 14:54:50 +06:00
7c5c37add3 sword 2d/3d views restored 2022-09-01 14:34:16 +06:00
ca90fd6f6e Battery inventory slot bg tweaks 2022-09-01 14:30:32 +06:00
2c568e46fc
Better scrollbar textures 2022-09-01 15:11:26 +07:00
db6c637ef7
Merge remote-tracking branch 'origin/master' into master 2022-09-01 14:53:01 +07:00
c9ca5f64f6
Pattern, equipment battery and matter capacitor slot backgrounds 2022-09-01 14:52:53 +07:00
f63a87298d
Battery slot background icon 2022-09-01 14:38:57 +07:00
f80f9f82f2 Exosuit probe texture haha 2022-09-01 00:51:21 +06:00
7c9e5902c3 Fixed a big dumb 2022-08-31 23:52:46 +06:00
5d722152b0 Updated Tritanium helmet texture to fit the updated model; Added a unique detail for capacitor battery; Added emissive textures for OptiFine; 2022-08-31 23:41:46 +06:00
4ecd5420e0 Android station minor model update 2022-08-31 22:22:53 +06:00
f136760ace
Add player slot listener to exosuit menu 2022-08-31 15:14:27 +07:00
3593dd8bbc
Wide power gauge 2022-08-31 13:26:08 +07:00
ec886bf6ba
Display forward slash when research is already blocked by another research 2022-08-31 12:02:06 +07:00
4ef539653c Glass panes now finally have a frame texture on their edges; Energy sword 3D model update; Tritanium armor model update; 2022-08-31 04:49:12 +06:00
2374a06a78
ExoSuit test
Discrete Scroll Bar Panel
Field Synchronize improvements
2022-08-30 22:13:12 +07:00
58bd62d1a2
Get rid of most code in MatteryScreen 2022-08-30 01:26:56 +07:00
c8f098effb
Moar recipes! 2022-08-28 18:56:48 +07:00
abedc7eace
World ore generation 2022-08-25 22:03:25 +07:00
65dd7cead9
Visualize blocked/blocking research 2022-08-23 22:53:42 +07:00
9746bfa69a
Repaint cross to white
because it is much easier to paint to desired color on the fly
2022-08-23 22:34:41 +07:00
4c7238e40a
Add red cross widget 2022-08-23 22:32:19 +07:00
3c7bff7a01
update mods.toml 2022-08-19 01:17:22 +07:00
0facae6ce4
Vastly improve square buttons, add enum variant 2022-06-29 15:39:42 +07:00
aaf3b31cdd
A bit of functional crafting inside item viewer 2022-06-29 00:49:16 +07:00
4bb8f999d1
New item viewer screen, that just does absolutely nothing 2022-06-28 19:41:40 +07:00
f3a9234440
Split widget file 2022-06-21 23:10:38 +07:00
cb171a63be
Added missing white/stripe tritanium block variant, added locale for striped blocks 2022-05-21 16:07:50 +07:00
9185473df6
Clean up registry, Language datagen 2022-05-21 15:36:18 +07:00
d0c1a7ec5a
Colored vents 2022-05-21 11:11:44 +07:00
69b3f723e6 Vent and Vent alt presets 2022-05-20 22:52:15 +06:00
f91581dce0
Matter bottler blockstate 2022-05-20 21:15:00 +07:00
0927578e96
Striped Colored Tritanium Blocks 2022-05-20 20:51:20 +07:00
1ed1474d3d
Gravitation stabilizer description 2022-05-20 19:14:29 +07:00
dd145ac023 Matter bottler blockstate parts 2022-05-16 20:05:05 +06:00
a2d861a0af Overheat sound for plasma weapons and colorless striped block base textures; 2022-05-16 19:42:31 +06:00
e0891620b2
Data for new colored blocks 2022-05-16 19:24:10 +07:00
8d7b73080f
Colored floor tiles and tritanium block 2022-05-16 19:08:25 +07:00
bfb6767d1c
Merge remote-tracking branch 'origin/master' into master 2022-05-16 16:10:06 +07:00
1cd065d432 Fixed z fighting 2022-05-16 14:31:51 +06:00
f35974e23a
Merge remote-tracking branch 'origin/master' into master 2022-05-16 13:57:57 +07:00
89581bbb52
Portable condensation drive now use new item filter
Item filter now supports tag and nbt matching
2022-05-16 13:54:04 +07:00
86c706a178
Fix inability to paint colorless tritanium crate 2022-05-16 13:30:46 +07:00
45185db2b1 Floor tiles, vents and colorless tritanium building blocks;
Storage bus, importer and exporter models (Dbot i made the models, now please make them work with cables)
2022-05-16 01:16:04 +06:00
99340baf30
Becoming android sound 2022-05-15 19:47:01 +07:00
2e58853c74
Match vanilla locale at glass naming 2022-05-15 19:22:15 +07:00
2a4c3795b5
Cargo crate models 2022-05-15 19:12:32 +07:00
27fa58c418 A cratte biþ a smale boxe wiþ no leggys, whiche liueþ boþe in water and on londe. Hit biþ ofte tyme broune or grene or yelowe; or be hit tropyckal, hit may hauen dyuers coloures lyk reed, blewe, and blak. Tropyckalle crattes liuyn in trewes. 2022-05-15 16:45:51 +06:00
aabcaeaf46
Merge remote-tracking branch 'origin/master' into master 2022-05-15 17:26:43 +07:00
5a494b35cb
Color-less cargo crate 2022-05-15 17:26:25 +07:00
4be8ecee2d Merge remote-tracking branch 'origin/master' 2022-05-15 16:13:16 +06:00
429860bb5d Matter dust texture;
Matter recycler model/texture;
Gravitation field limiter and sensor textures;
Fixed matter capacitor parts matter color;
Singularity scanner now has a face;
2022-05-15 16:12:55 +06:00
140042bbd4
Cargo crates recipe and data 2022-05-15 16:14:43 +07:00
bf2caccecd
Industrial glass finishing up 2022-05-15 15:42:49 +07:00
07efb6ed85
Update datagen for previous commit 2022-05-15 14:13:13 +07:00
0c8363f3c7
Merge remote-tracking branch 'origin/master' into master 2022-05-15 13:53:19 +07:00
d9ce8ca3b5
Plasma weapon heating, hud and energy usage 2022-05-15 13:53:11 +07:00
dec110c16e Added storage cable texture;
Changed the color of matter in all item and block textures;
Added gravitation field limiter and gravitational field sensor textures;
Updated Portable gravitation stabilizer texture;
Added plasma ball projectile texture (Dbot, this, placeholder at least);
Added Storage power supplier model and texture, however it is not loaded (Dbot pls fix i forgor);
2022-05-15 01:01:33 +06:00
25916f920d
Plasma rifle fire sound 2022-05-14 22:31:43 +07:00
813a6f0ceb
Checkboxes! 2022-05-14 21:39:46 +07:00
bdb6aa1c21
Storage exporter 2022-05-14 19:18:10 +07:00
3e66862de8
Storage import bus 2022-05-14 18:38:30 +07:00
ba17a812e3
Storage power supplier block 2022-05-10 21:43:53 +07:00
d62c308637
Storage cable translation string 2022-05-10 17:27:48 +07:00
21e847676f
Port to 1.18.2 2022-03-28 17:49:33 +07:00
3ed3f43c59
typo 2022-03-28 12:39:07 +07:00
09d63c19a1 >Portable gravitational stabilizer now has a model.
>Plasma rifle and Energy sword now has a 2d texture as item model, but draws a 3d model in hand.
>Tweaked Plasma rifle position in first person.
2022-03-17 22:28:41 +06:00
4f1e2217fe Gun model 2022-03-06 17:43:28 +06:00
f7bfc5fb86 Singularity scanner model 2022-03-06 04:09:20 +06:00
b4cb36a42d Powered cake slicer model 2022-03-05 17:02:43 +06:00
da7be875d5
Typo 2022-02-25 07:50:45 +07:00
f5d17f6bdb
Energy Sword
Fixes #17
2022-02-23 14:52:38 +07:00
dd6d30e011
Number client input, energy counter io limit 2022-02-22 18:39:03 +07:00
dc535dd01a
Update mods.toml 2022-01-31 23:39:03 +07:00
34f6d8e3aa
Energy counter direction switch right in gui 2022-01-31 17:50:48 +07:00
03c04178e7
Failure chance in matter replicator, fix tick precision in worker, various fixes 2022-01-30 16:43:30 +07:00
8bd6852d10
Matter Recycler, Matter Dust and some fixes 2022-01-30 13:02:03 +07:00
da5aa346fb
New Matter registry, with better balance and "complexity" support 2022-01-29 17:38:25 +07:00
17af248426
Merge remote-tracking branch 'origin/master' into master 2022-01-26 13:11:49 +07:00
6cd04682d7
Added energy counter in-world render 2022-01-25 12:54:09 +07:00
5346e1917d -Added industrial glass textures; -Added item model for gravitation stabilizer; -Changed tritanium armor visor to black; 2022-01-25 00:35:07 +06:00
9918e18113 -Gravitational stabilizer idle texture updated 2022-01-24 11:23:47 +06:00
7826e5d842
Gravitation stabilizer lens 2022-01-24 12:21:34 +07:00
3f3438c124 -Added Tritanium armor item textures; -Added dithering on tritanium blocks; -Modified some component textures; -Creative pattern drive is now golden; -Added gravitational stabilizer main block and lens block models. 2022-01-23 20:55:44 +06:00
88755f991a -Fixed Plate press UV error; -Tritanium armor model is practically complete 2022-01-23 03:38:05 +06:00
5c3c6d5f93
Add locale for tritanium armor 2022-01-22 16:27:25 +07:00
23cbf9abdf
Add test code for tritanium armor and portable grav stabilizer 2022-01-22 16:26:09 +07:00
27646a0bad
Rename MtE to MtJ (Mattery Joules) 2022-01-21 11:48:25 +07:00
91fd990d5c
Singularity scanner and some item components 2022-01-21 11:44:34 +07:00
1ce4578336
A lot of math stuff and text rendering in gmod api style 2022-01-20 18:37:30 +07:00
a3094549de PLATE PRESS MODEL HAAAAA 2022-01-14 22:10:41 +06:00
4001eea509
Update data and datagen for latest added blocks 2022-01-14 20:54:27 +07:00
23df86e2f6
Gravitation stabilizer and slightly better blackhole gravity 2022-01-14 20:29:54 +07:00
c6772f8003
Added more recipes 2022-01-14 18:27:28 +07:00
24ec919450
Update recipes 2022-01-14 18:01:34 +07:00
c016b8850d
Plate Press
initial datagen for recipes
fix addItem ranges in MatteryContainer
2022-01-14 17:19:09 +07:00
e9385efd5c
Translation for tritanium tools 2022-01-13 17:59:44 +07:00
0efffda64c Tritanium instruments ХЫХА ХА 2022-01-13 16:19:34 +06:00
e20a81c02c
Android research refund pill and health pill 2022-01-13 15:10:05 +07:00
4b4e219a51
Physical model of energy counter 2022-01-09 15:08:25 +07:00
f3600b1f8f
Bring back shapegen, this time as command line tool, update blackhole model 2022-01-09 14:15:22 +07:00
55af4149ff
new black hole model 2022-01-09 14:01:24 +07:00
ba68a032c2
Finally make energy counter model rotate correctly
thanks mojang for not having z axis rotation
very cool
2022-01-09 13:51:39 +07:00
eabca10e5e
Make chemical generator mineable 2022-01-08 19:05:54 +07:00
17f3e51a25
Make energy counter mineable 2022-01-08 19:01:53 +07:00
6714cbd479
æugh, datagen 2022-01-08 18:52:17 +07:00
6c029b98b7
Updated energy counter, move energy API to kotlin 2022-01-03 21:06:21 +07:00
9261562de7
Move more to kotlin, add shapes and locale to item monitor and drive rack 2022-01-01 13:35:41 +07:00
39096c0f14
Recreate android station menu 2021-12-31 15:33:14 +07:00
a8349b70d5
Merge branch 'master' of gitlab.com:DBotThePony/overdrive-that-matters into master 2021-12-31 13:19:02 +07:00
752a3aeaea Chemical generator model complete; Fixed pattern monitor displaying incorrectly when placed on the ceiling; Fixed z-fighting on some models with decorative frames by giving them 0.5 pixel width; Changed framed carbon fibre block texture to one without frame for the time being; Fixed that one UV mistake i made on drive viewer model; Fixed a typo i made in drive rack's model that caused it's particles to display incorrectly. 2021-12-29 02:23:00 +06:00
eadf061f15
New interface prototypes 2021-12-28 22:18:47 +07:00
0eaf13b1de
Chemical power generator, some kotlin extensions 2021-12-26 23:00:59 +07:00
915ae6d6d6
Update version dependency to 1.18.1 2021-12-20 11:12:47 +07:00
70709aad5a
update locale 2021-12-03 12:48:55 +07:00
9e1650c70d
Better sleep conversion process 2021-12-03 12:34:56 +07:00
5eb9599a26
Becoming android through sleeping 2021-12-03 11:40:42 +07:00
0fa73fb409
Make things compile on 1.18 2021-12-01 18:44:23 +07:00
e47c370a96
Record history of energy passed in energy counter 2021-11-21 13:01:49 +07:00
68a084182f
Merge branch 'master' of gitlab.com:DBotThePony/overdrive-that-matters into master 2021-11-20 12:32:02 +07:00
08ce52906a -New drive rack model.
-New energy counter model.
-New item monitor model.
2021-10-18 15:44:37 +06:00
8cf0df6f59
Even more recipes 2021-10-12 21:23:36 +07:00
6f7ab85692 fix 2021-10-06 13:01:17 +06:00
9563a54a8d -Added black hole item TEXTURE because Gearshock thinks it would be cooler this way.
-Optimized block textures where it is possible
2021-10-06 12:33:32 +06:00
9212c83074
Add more recipes 2021-09-19 18:48:00 +07:00
e6b7308c3b
Energy counter test 2021-09-11 23:36:46 +07:00
65ee43fd11
Machine redstone controls 2021-09-10 11:31:45 +07:00
f5b35349ff
Merge remote-tracking branch 'origin/master' into master 2021-09-10 09:56:56 +07:00
89d019b8ad extended reach icon 2021-09-10 08:54:15 +06:00
ab28713db9
Android research better names 2021-09-10 09:51:30 +07:00
54facf02c6
Android extended reach 2021-09-10 09:49:02 +07:00
fc7bc8ec4a
Merge remote-tracking branch 'origin/master' into master 2021-09-08 22:50:31 +07:00
9a52043443 Added a gravitational disruptor item model 2021-09-04 03:53:32 +06:00
f6e48e550e Added Matter capacitor parts.
Added titanium ore stuff
2021-09-03 18:55:53 +06:00
7ff41bbda2
Better wording in description 2021-09-03 15:48:12 +07:00
0d3e7c4112
Update description of disruptor 2021-09-03 14:17:36 +07:00
0a6dbb3b50
Gravitational Disruptor and black hole explosions 2021-09-03 14:02:50 +07:00
5b9760c2ed
Change blackhole gravity formula to square, change model to singularity 2021-09-03 12:20:11 +07:00
a39dd28199
Merge remote-tracking branch 'origin/master' into master 2021-09-03 11:47:20 +07:00
cc51a44070
Tritanium ore 2021-09-03 11:47:03 +07:00
d41fb35fb1 Added a model for cargo crate.
added textures for matter capacitor parts.
changed cargo container block textures.
2021-09-02 17:35:13 +06:00
13ae6d597b
Merge remote-tracking branch 'origin/master' into master 2021-09-02 16:01:49 +07:00
b81c76e2e5
Add cargo crate 2021-09-02 16:01:38 +07:00
8b3e303b21 Updated matter cable texture.
Updated drive viewer model.
Added new models/textures for crafting components.
2021-09-02 14:04:21 +06:00
bd02a3186d
Update locale to match minecraft style 2021-09-02 14:06:03 +07:00
e4a7ca35f7
Localization for items 2021-09-02 14:03:26 +07:00
107c1e2ed2
More matter capacitors 2021-09-02 13:57:33 +07:00
b3330a2f1f
Some crafting ingredients and first recipes 2021-09-01 20:31:50 +07:00
ccadc1647f drive viewer blockstate models 2021-09-01 00:05:05 +06:00
4f8aaaa019
Merge branch 'master' of gitlab.com:DBotThePony/overdrive-that-matters into master 2021-08-31 19:45:20 +07:00
f0fa1a2d35
Remove auto generated file 2021-08-31 19:44:02 +07:00
a30e6dcb9b Added an "error" model for Matter decomposer, it's basically a copy of idle model because decomposer's blockstate keeps resetting after every build and changing both idle and error to idle model won't work. 2021-08-30 15:26:31 +06:00
2573a82559 Brain fart 2021-08-30 13:50:20 +06:00
fde2ab46ee
Remove auto generated files 2021-08-30 10:26:24 +07:00
7af10649ef
Merge remote-tracking branch 'remotes/origin/master' into master 2021-08-30 10:25:05 +07:00
8fe2d8daa8
Black holes 2021-08-30 10:22:58 +07:00
bf49fc030d Added a model for matter bottler.
Added models for condensation drives.
Added a model for drive viewer.
Added container block textures.
Added Tritanium block textures.
Added item names to container blocks.
Changed Creative matter capacitor to look more like creative battery.
2021-08-30 04:41:19 +06:00
ac7bcc0f75
Add gitkeeps 2021-08-29 20:02:01 +07:00
9ecbad9f48
Make crates mineable 2021-08-29 19:35:36 +07:00
baa789b77a
More building blocks 2021-08-29 19:22:59 +07:00
a5fe020564
Merge remote-tracking branch 'origin/master' into master 2021-08-29 17:02:34 +07:00
3506e661b1
Add second variant of condensation drive 2021-08-29 16:49:02 +07:00
b3b1a03136
Filter of autopickup for condensation drive 2021-08-29 16:30:34 +07:00
b0e9a96e50
Reasonable interaction with drive viewer 2021-08-28 14:47:01 +07:00
2166119a75
Improve drive testcode 2021-08-26 10:41:48 +07:00
e7e12bed8c
Condensation drive test 2021-08-25 22:53:17 +07:00
76de8549aa fixed an error in matter decomposer's model, again. 2021-08-25 02:42:23 +06:00
1650e63e20 Merge branch 'master' of https://gitlab.com/DBotThePony/overdrive-that-matters 2021-08-24 21:42:25 +06:00
4613b5549e fixed an error in matter decomposer's model 2021-08-24 21:41:59 +06:00
d7a62f6d3c
Merge remote-tracking branch 'origin/master' into master 2021-08-24 22:41:06 +07:00
e5f81569f9
Better research screen 2021-08-24 22:28:44 +07:00
f388639fc6
Primitive research "tree" 2021-08-24 22:09:38 +07:00
dc76513dc8
Proper stat casing 2021-08-24 19:02:44 +07:00
9f7cc25ef5
Stats! 2021-08-24 19:01:34 +07:00
7c5bfb1b36
Nanobots, Regeneration and Armor features and research 2021-08-24 18:14:53 +07:00
39795e2659 Added Nutrient paste in language file, because it was not here for some reason 2021-08-24 14:15:53 +06:00
64d41e450a
Make builder also build research entry, add blocking research 2021-08-24 14:19:18 +07:00
002b335f47
Matter bottler, UV winding order for widgets, EditablePanel#asGrid 2021-08-24 11:58:26 +07:00
eab7e1de10
Matter bottler 2021-08-24 00:59:22 +07:00
95a96c35ca
Pattern fillage gauge 2021-08-23 19:39:27 +07:00
3098a08d6e
Attack speed overclocking, improve research builder 2021-08-23 14:52:12 +07:00
1bb85a6d73
Merge remote-tracking branch 'origin/master' into master 2021-08-23 11:46:34 +07:00
0365c09398
Feature modifiers and levels, limb overclocking, research improvements 2021-08-23 11:46:13 +07:00
04f09a0544 Added new block textures/models: carbon fiber, container block. Added a cargo container texture. Added a texture for nutrient paste 2021-08-23 10:16:34 +06:00
c66c64f87a
Research icons? 2021-08-22 23:21:29 +07:00
bba2a1d9e0
More abstract and straightforward android research system 2021-08-22 22:45:36 +07:00
6769af52f5
More research work 2021-08-22 20:04:47 +07:00
9e726e1779
Research render test 2021-08-22 19:22:30 +07:00
5c72218cf8
Merge remote-tracking branch 'origin/master' into master 2021-08-22 17:12:10 +07:00
7bd1de8171
Reimplement pattern panel menu 2021-08-22 16:43:19 +07:00
6f68a2b1d6
Add battery and mater capacitor models 2021-08-20 22:02:04 +07:00
92bde060f6
Delete generated assets 2021-08-20 21:31:54 +07:00
38495e59c1
Mattery screen rework for panels test 2021-08-20 16:49:12 +07:00
500640807e the machines are now DESATURATED
I STOLE YOUR COLORS MUHAHAHAHAHAHAHAHA-
2021-08-19 23:44:53 +06:00
1b73eea70a
Render helper 2021-08-19 22:16:50 +07:00
6cc17216a3
Better android charge handling 2021-08-19 11:23:49 +07:00
be47a36cc3
Merge remote-tracking branch 'origin/master' into master 2021-08-19 10:40:34 +07:00
017478b312
Display custom You died message as android 2021-08-19 10:33:52 +07:00
0d27b058aa Fixed some items appearing in the inventory incorrectly. 2021-08-18 23:29:52 +06:00
4668bcc71c
Update assets from last commit 2021-08-18 19:18:08 +07:00
928fdc889f Added active/inactive/halted variants of the blocks.
Added previously missed matter panel.
2021-08-18 18:09:35 +06:00
02bbef97bd
Remove generated resource 2021-08-18 19:05:53 +07:00
5844eee9f5
Add missing loot tables 2021-08-18 18:56:35 +07:00
189dcbe60f
remove auto generated assets 2021-08-18 18:40:45 +07:00
3f5d1bb129
delete generated assets 2021-08-18 17:40:19 +07:00
b929dcdb3a
Add auto generated pattern storage models and blockstate 2021-08-18 17:21:26 +07:00
778d1310b9
Move xcf to LFS 2021-08-18 15:08:57 +07:00
f04a353ab6
Added "halted" and "inactive" versions of machines.
Added new models/textures for following machines:
Matter replicator, Matter scanner, Matter panel, Matter decomposer.
2021-08-18 10:10:55 +07:00
600463208f
Matter task viewing and managing 2021-08-18 00:01:37 +07:00
ed1d9b150c
Creative pattern drive 2021-08-17 19:40:53 +07:00
ac3204b2f3
Custom creative tab 2021-08-17 19:16:56 +07:00
8dd27d4368
Merge branch 'develop' of gitlab.com:DBotThePony/overdrive-that-matters into master 2021-08-17 13:36:15 +07:00
3b313ec162
Pattern monitor and Matter replicator! 2021-08-17 13:35:11 +07:00
da88d111dd ADDED MORE GRAPHIX 2021-08-17 12:15:16 +06:00
aedb169eca
Patterns, Pattern Storages and Matter Scanner! 2021-08-16 11:45:55 +07:00
8498bfdbcf
Shapes 2021-08-15 20:24:55 +07:00
61add16d1e
Matter cables 2021-08-15 20:00:08 +07:00
2328cd75b6
Assets for battery and matter capacitor banks 2021-08-15 00:12:40 +07:00
0471c27c44
Assets for battery and matter capacitor banks 2021-08-15 00:12:34 +07:00
beca7b88c2
Update color of energy 2021-08-14 23:16:53 +07:00
4e971b3e0b
Matter grid, matter capacitors and banks! 2021-08-14 23:11:46 +07:00
84929d4c91
Update widget gauges styling 2021-08-14 12:39:40 +07:00
4a6c50e5a9
update widgets 2021-08-14 12:38:03 +07:00
010fd38e92
update widgets 2021-08-14 12:37:34 +07:00
d5a0c8acd2
Progress widget 2021-08-14 12:27:31 +07:00
bafe6c23d9
Matter decomposer! 2021-08-13 19:57:15 +07:00
a33879f81e
Matter registry and basic scanning 2021-08-13 00:57:27 +07:00
51e424d9af
Battery bank! 2021-08-12 01:12:58 +07:00
7283c9a1ae
Batteries 2021-08-11 22:25:33 +07:00
cc05975c2f
Translations! and formatters 2021-08-11 20:52:56 +07:00
7087705f22
Networking test, player capability is now networked to them 2021-08-11 12:55:18 +07:00
fb727a55bb
Android station graphics 2021-08-10 15:39:35 +07:00
f440a593f3
Abstraction, separation, battery containers 2021-08-10 15:30:47 +07:00