Compare commits

...

5038 Commits

Author SHA1 Message Date
Boblet
6bb6b5426c the ground trembles with my every step 2026-01-23 14:53:39 +01:00
Boblet
492703ab23 amogus 2026-01-23 14:50:29 +01:00
Bob
b4d0122cfc monty python's horrible world of gravity 2026-01-22 21:48:48 +01:00
Boblet
f809843745 calliou is impaled on an asbestos stalagmite and dies 2026-01-22 15:38:17 +01:00
Boblet
6401ffde19 now kiss 2026-01-21 16:27:35 +01:00
Boblet
1aba934d36 e 2026-01-21 13:12:32 +01:00
Boblet
69c1ed01fa the glunch lunch 2026-01-21 13:11:28 +01:00
Boblet
e776b4c8d9 the gloach 2026-01-20 16:56:00 +01:00
HbmMods
6fa00c5771
Merge pull request #2643 from Bufka2011/master
Enhance CI workflow with version update logic
2026-01-20 11:06:19 +01:00
HbmMods
69c1f49f55
Merge pull request #2661 from Voxelstice/oc-comp-fix
OC connection with multiblocks bug fix
2026-01-20 10:33:15 +01:00
HbmMods
ade48e4ac7
Merge pull request #2656 from RayzerHan/master
Update ru_RU lang again
2026-01-20 10:32:18 +01:00
Bob
6c1fd10a50 plushby 2026-01-19 21:23:57 +01:00
Raaaaaaaaaay
a2fd0ea108
ok 2026-01-19 13:50:22 +02:00
Raaaaaaaaaay
33a4b983e5
Компонзит 2026-01-19 13:42:34 +02:00
Raaaaaaaaaay
0d431e387b
ммм 2026-01-19 13:37:10 +02:00
Raaaaaaaaaay
f0a1eaaaff
фикс 2026-01-19 13:36:01 +02:00
Raaaaaaaaaay
165fd062f4
ням 2026-01-18 20:07:30 +02:00
Voxelstice
7b18634b34 here's hoping this doesnt break anything else
OC connection with multiblocks bug fix
2026-01-17 10:42:19 +03:00
Raaaaaaaaaay
99ca4628dc
Kyiv 2026-01-15 21:29:53 +02:00
Raaaaaaaaaay
b892f0cc37
Merge branch 'HbmMods:master' into master 2026-01-15 17:58:02 +02:00
Boblet
7664cacd2f double barrel shaboing hot dog
(frot dog)
2026-01-14 15:54:59 +01:00
Raaaaaaaaaay
e96e821146
next door two 2026-01-14 09:18:38 +02:00
Raaaaaaaaaay
e02e4f6aae
next door 2026-01-14 09:15:59 +02:00
Raaaaaaaaaay
c1464f2881
Update 2026-01-14 02:01:10 +02:00
Raaaaaaaaaay
91dd4cc218
Sometimes I think the wind blows well, but the robot is a slut 2026-01-13 18:56:03 +02:00
Raaaaaaaaaay
6cadca0d89
People are idiots, and that's a fact. 2026-01-13 18:53:52 +02:00
HbmMods
5c9d71c626
Merge pull request #2649 from RayzerHan/master
Update RU_ru lang
2026-01-13 15:14:17 +01:00
Raaaaaaaaaay
bd03028170
фак 2026-01-13 16:06:08 +02:00
HbmMods
67aee6a2e0
Merge pull request #2648 from Vaern/muzzle-flashes
Visible third-person muzzle flashes from other players +self, skeleguns
2026-01-13 15:04:52 +01:00
Vaern
223fe240c1 remove redundant TODO 2026-01-12 23:55:29 -08:00
Vaern
5cb013d545 extended timeout duration
the highest duration for muzzle flashes is 150?, not under 100, so let's be safe
2026-01-12 23:39:50 -08:00
Vaern
82293e46cd copypaste hell
fixed tick issues in eventHandler, added packets to orchestra + third person rendering for every gun with built-in muzzle/laser flashes, and softened playAnimation so skeleguns use orchestra/muzzle flashes. akimbos show both firing, probably won't be changed
2026-01-12 23:33:05 -08:00
Raaaaaaaaaay
2e7af7058c
Merge branch 'HbmMods:master' into master 2026-01-12 19:58:03 +02:00
Raaaaaaaaaay
cc816b40e0
Очень познавательно, милая пони 2026-01-12 19:55:17 +02:00
Boblet
64fc72e18a margret thatcher is dead 2026-01-12 16:45:09 +01:00
Boblet
76c6222f45 post merge cleanup 2026-01-12 10:30:50 +01:00
HbmMods
2f8b0dde49
Merge pull request #2607 from WolfEclipses/METADATA
Rad Absorbers Metadata (Done now)
2026-01-12 10:19:08 +01:00
Vaern
712ae952df we ain't even done wit this we #KillingOurselves
superficial dedicated + integrated server testing worked. ran into a weird race condition on the former, though, but i doubt that's from anythng here
2026-01-11 18:17:36 -08:00
Bob
b2df165b4b the spingus 2026-01-11 22:24:04 +01:00
Wolf
90e148e022 I think I finally fixed this shit 2026-01-11 16:18:37 -05:00
WolfEclipses
52440fca2f
Merge branch 'HbmMods:master' into METADATA 2026-01-11 15:58:45 -05:00
Wolf
292b989e09 Testing??? 2026-01-11 15:56:24 -05:00
Raaaaaaaaaay
b0e0b54def
бля 2026-01-11 22:28:00 +02:00
HbmMods
51b758e103
Merge pull request #2645 from RayzerHan/master
update RU_ru lang
2026-01-11 21:00:24 +01:00
Raaaaaaaaaay
d25cef888d
Merge branch 'HbmMods:master' into master 2026-01-11 21:51:52 +02:00
Raaaaaaaaaay
62ce75f458
battery 2026-01-11 21:45:35 +02:00
Bufka2011
c146829bf4
Merge branch 'HbmMods:master' into master 2026-01-11 12:24:43 -07:00
Bufka2011
b60cf07e98
Enhance CI workflow with version update logic
Added steps to calculate days since 10/10/10 and update version files accordingly.
2026-01-11 12:24:11 -07:00
HbmMods
0e30985963
Merge pull request #2639 from ranch21/calc
calculator history
2026-01-11 20:23:09 +01:00
HbmMods
a491b16dfe
Merge pull request #2641 from sunryze-git/improved-pneumatics
improved pneumatics throughput
2026-01-11 20:22:26 +01:00
Bob
026c0d074e mirror fix 2026-01-11 20:21:02 +01:00
sunryze-git
6cc60c0234 pneumatic throughput now doesnt suck cuz we dont give up instantly 2026-01-11 14:17:00 -05:00
WolfEclipses
1f17af27f7
Merge branch 'master' into METADATA 2026-01-11 13:32:05 -05:00
HbmMods
8aa9ff2895
Merge pull request #2630 from Voxelstice/oc-bat-rework
OC compat for new batteries
2026-01-11 19:20:28 +01:00
HbmMods
5c0ff2b603
Merge branch 'master' into oc-bat-rework 2026-01-11 19:20:18 +01:00
HbmMods
3c461313bc
Merge pull request #2636 from RayzerHan/master
update RU_ru lang
2026-01-11 19:18:39 +01:00
Bob
71fb9a814d he rotates 2026-01-11 19:14:08 +01:00
ranch
27e4cd32aa gui design is my passion 2026-01-10 17:38:05 -06:00
Bob
8bdce3a4b3 been thinking about that yaoi 2026-01-10 21:31:09 +01:00
Bob
4bfce2ba92 Auto stash before merge of "master" and "origin/master" 2026-01-10 14:39:59 +01:00
WolfEclipses
5ec68643f8
Merge branch 'master' into METADATA 2026-01-09 20:52:29 -05:00
Voxelstice
65ea177ac0 consider not forgetting. thanks.
priority is outputted correctly now
2026-01-09 23:05:21 +03:00
Voxelstice
be93b9cc8c waiter! waiter! more lead acid batteries please!
adds OC compat to new battery blocks
2026-01-09 23:01:38 +03:00
Raaaaaaaaaay
439d5e52b8
электромассивы 2026-01-09 16:43:32 +02:00
Raaaaaaaaaay
72500ed749
термоядерный термоядерный 2026-01-09 16:28:44 +02:00
Boblet
f17556a0d6 fentanyl 2026-01-09 14:55:58 +01:00
HbmMods
6a732fadde
Merge pull request #2624 from ranch21/better-bars
Better electric FSB hud bars
2026-01-09 10:07:07 +01:00
HbmMods
bcb2f1a198
Merge pull request #2625 from MellowArpeggiation/msu-ui
in world UI for mass storage units
2026-01-09 10:06:37 +01:00
Boblet
79351bbd0a do you come from a vegetmite sandwich? 2026-01-09 10:05:56 +01:00
George Paton
a6087b4bef vanilla slimes also leak state who'da'fucken'thunk it 2026-01-09 14:48:52 +11:00
George Paton
9f26d04f7a buzzer beater functionality: render 3D items with fancy graphics enabled! 2026-01-09 14:08:07 +11:00
Boblet
84326bedb4 bals 2026-01-08 17:43:07 +01:00
George Paton
a0a7e000d4 drop correct meta on breaking 2026-01-08 22:26:26 +11:00
George Paton
b5b4a537c5 what the fuck is this baby doing mixed in with my bathwater 2026-01-08 22:17:25 +11:00
George Paton
7757e3cb53 add a fill progress bar 2026-01-08 22:07:21 +11:00
George Paton
b77633b152 draw the rest of the owl 2026-01-08 21:01:57 +11:00
Boblet
9ef7668702 FUCK 2026-01-08 08:52:22 +01:00
ranch
4998cd13c2 we do a little cleanup 2026-01-08 01:19:32 -06:00
ranch
1aaf568338 better electric FSB hud 2026-01-08 01:01:27 -06:00
George Paton
18a4d7a25a basic rendering of items inside MSUs (on the north face only atm) complete 2026-01-08 15:32:12 +11:00
Boblet
2b9d43891a dance the safety dance 2026-01-07 16:44:15 +01:00
HbmMods
0197ee79a7
Merge pull request #2617 from RayzerHan/master
update RU_ru lang
2026-01-07 10:52:59 +01:00
HbmMods
6297bbd6a8
Merge pull request #2618 from NarekoMichigami810/master
zh_CN update
2026-01-07 10:51:45 +01:00
道神 馴子
ad9130079e
Rape my brain 2026-01-07 17:41:15 +08:00
道神 馴子
7a39fd778f
i cum on my face 2026-01-07 17:28:48 +08:00
道神 馴子
ee0149c133
姗姗来迟 2026-01-07 16:34:31 +08:00
Raaaaaaaaaay
ee643f4407
Merge branch 'HbmMods:master' into master 2026-01-06 22:26:01 +02:00
Raaaaaaaaaay
218ad3e59e
кумавы 2026-01-06 22:24:38 +02:00
Bob
4032cc277a he thicc 2026-01-06 21:21:06 +01:00
Raaaaaaaaaay
4b4868e102
kimi 2026-01-06 22:17:28 +02:00
Raaaaaaaaaay
83d4505021
и танцевала рыбка с раком 2026-01-06 21:00:40 +02:00
Raaaaaaaaaay
0e063bbd72
up up up 2026-01-06 20:50:33 +02:00
Raaaaaaaaaay
29960cdc0a
Merge branch 'HbmMods:master' into master 2026-01-06 20:42:21 +02:00
HbmMods
d718b58269
Merge pull request #2605 from Toshayo/master
Fluid valve with counter for simpler automation
2026-01-06 19:38:13 +01:00
HbmMods
6141d1d24e
Merge branch 'master' into master 2026-01-06 19:38:02 +01:00
Bob
8619c8e67d he big 2026-01-06 19:35:39 +01:00
Raaaaaaaaaay
9c89902e56
aoh 2026-01-04 21:12:53 +02:00
Bob
b20d5f46b2 more caching because sure 2026-01-03 12:22:56 +01:00
WolfEclipses
52ae974f51
Merge branch 'master' into METADATA 2026-01-02 20:13:04 -05:00
Bob
a7afacfaf2 flavor town 2026-01-02 11:20:15 +01:00
Wolf
f089578ba7 Got rid of functionality for legacy rad absorber 2026-01-01 19:55:49 -05:00
Wolf
1e4346a54b Fixed redundant functions (there were more than I thought) xd 2026-01-01 19:40:37 -05:00
WolfEclipses
a1b83b4a67
Merge branch 'master' into METADATA 2026-01-01 18:38:27 -05:00
Raaaaaaaaaay
4e7bbda689
ня 2026-01-01 17:59:35 +02:00
HbmMods
539225cf78
Merge pull request #2608 from WolfEclipses/WATER
Infinite Water tank Recipe
2026-01-01 14:56:07 +01:00
HbmMods
195cf193c7
Merge pull request #2613 from WolfEclipses/OilQMAW
QMAW Page for crude oil
2026-01-01 14:55:47 +01:00
HbmMods
fd348a40e7
Merge pull request #2614 from PewPewCricket/master
Update PWR OpenComputers Compat
2026-01-01 14:54:26 +01:00
HbmMods
6964b4ec9d
Merge pull request #2606 from Goaty1208/master
mhmhmgmg pizza
2026-01-01 14:52:39 +01:00
PewPewCricket
1418a9be87
Merge branch 'HbmMods:master' into master 2025-12-31 19:30:45 -06:00
Bob
f87b37d7e3 well, too bad 2025-12-31 15:38:24 +01:00
PewPewCricket
871de4ae47 fix PWRangler crashing with PWRs using heat sinks 2025-12-30 18:40:08 -06:00
PewPewCricket
89b1cb1de0 allow reading core heat capacity using OC with PWRs. 2025-12-30 17:50:38 -06:00
Wolf
5dc1ee440b Forgot to account for all processing methods, need to expand in their own pages 2025-12-29 19:33:08 -05:00
Wolf
e52f70b340 QMAW Page for crude oil 2025-12-29 19:09:44 -05:00
Goaty1208
e629802bcb Cruciblelicious 2025-12-28 11:42:38 +01:00
Wolf
59bccc9be3 Why am I being asked for this so often 2025-12-27 18:46:01 -05:00
Wolf
838bcb8faa Had them swapped up somehow xd 2025-12-27 18:18:48 -05:00
Goaty1208
5100384e18 mhmhmgmg pizza
Fixed translations
2025-12-27 23:40:46 +01:00
Wolf
a8b046f46b Bringing up to date because yeah 2025-12-27 17:19:45 -05:00
WolfEclipses
6b87447ca1
Merge branch 'master' into METADATA 2025-12-27 14:01:57 -05:00
Toshayo
e601e79ad3
Updated changelog 2025-12-26 15:05:47 +01:00
Toshayo
a944c28dd4
Added fluid valve with counter 2025-12-26 14:14:20 +01:00
Bob
de2a11389c i like eating lead-sulfur batteries 2025-12-23 20:51:55 +01:00
Raaaaaaaaaay
b88d6f6cd3
aoh 2025-12-20 15:48:05 +02:00
Boblet
ef2b20d357 succumb 2025-12-17 14:55:50 +01:00
Boblet
f82a606b66 shit yourself 2025-12-16 16:16:19 +01:00
Boblet
c639be1429 67 mango mustard kendrick still water dubai labubu chocolate tralalero
please someone euthanize me
2025-12-16 15:22:51 +01:00
HbmMods
76e6e7852b
Merge pull request #2588 from RayzerHan/master
Update Ru_lang
2025-12-15 15:33:21 +01:00
Boblet
82f175105c bap 2025-12-15 15:33:10 +01:00
Boblet
fa12cfeec1 ow 2025-12-15 11:03:05 +01:00
Raaaaaaaaaay
7ee52ac56c
Merge branch 'HbmMods:master' into master 2025-12-14 22:37:42 +02:00
Bob
0fe125251b nobody saw a thing 2025-12-14 21:34:33 +01:00
Bob
5bcfd368fc yeag 2025-12-14 21:17:34 +01:00
Raaaaaaaaaay
154503a95d
руда 2025-12-13 00:04:57 +02:00
Raaaaaaaaaay
54cbb495cc
рыбка 2025-12-13 00:04:23 +02:00
Boblet
1f5fc1926c spoingus 2025-12-12 13:34:32 +01:00
Boblet
1e3e5f38d4 all our food keeps blowing up 2025-12-11 16:34:57 +01:00
Boblet
ec0613b9cf spingus 2025-12-10 16:32:34 +01:00
HbmMods
7204b3662c
Merge pull request #2581 from NarekoMichigami810/master
zh_CN update
2025-12-10 08:06:42 +01:00
Boblet
d5ac6fe239 death 2025-12-09 16:29:37 +01:00
Boblet
c916ad73e1 let the carnage begin 2025-12-09 15:27:24 +01:00
WolfEclipses
bce98561d3 Added back old ones, changed lang to OLD for them 2025-12-09 08:31:52 -05:00
道神 馴子
7129d5ee7c
沉迷勒布朗 2025-12-09 21:24:17 +08:00
WolfEclipses
003afa4071 Forgot to remove this from making the name work xd 2025-12-09 07:46:27 -05:00
WolfEclipses
7f963bdb6f I FORGOT TO ACCOUNT FOR OTHER LANGUAGES T_T 2025-12-08 22:44:49 -05:00
WolfEclipses
96298a5c31 I think this works :P we will find out that Im an
idiot in like 30seconds
2025-12-08 22:20:07 -05:00
Raaaaaaaaaay
540900d0f5
up amogus 2025-12-08 22:58:56 +02:00
Raaaaaaaaaay
10585527ae
Merge branch 'HbmMods:master' into master 2025-12-08 22:55:35 +02:00
Bob
d02b328c27 pain 2025-12-08 18:14:16 +01:00
Raaaaaaaaaay
510923d14a
beton 2025-12-08 17:31:43 +02:00
Raaaaaaaaaay
8b5cf6f321
Merge branch 'HbmMods:master' into master 2025-12-08 17:31:04 +02:00
Bob
39aa0de008 load of crap that doesn't work 2025-12-07 22:01:33 +01:00
Raaaaaaaaaay
bd17238c1c
fix recipe 2025-12-06 20:22:24 +02:00
Raaaaaaaaaay
63146394ac
Merge branch 'HbmMods:master' into master 2025-12-06 16:06:08 +02:00
Raaaaaaaaaay
7867d6c6bd
fix 2025-12-06 12:12:23 +02:00
Boblet
55b4fec00b it wasn't for a lack of trying 2025-12-05 14:38:13 +01:00
Boblet
2430fec8c6 ough 2025-12-04 15:55:00 +01:00
Raaaaaaaaaay
6cf88c673f
ой 2025-12-04 11:05:32 +02:00
Boblet
308e559229 spungus 2025-12-03 15:34:29 +01:00
Boblet
1fcfa136be perpetual agony mechanism 2025-12-01 16:54:04 +01:00
HbmMods
03e7db5d92
Merge pull request #2563 from MellowArpeggiation/structure-port
Structure Block!
2025-12-01 10:09:11 +01:00
Raaaaaaaaaay
a94005fc1f
Merge branch 'HbmMods:master' into master 2025-12-01 10:34:49 +02:00
Raaaaaaaaaay
548ede7f89
рыбки 2025-12-01 10:34:42 +02:00
Boblet
0e4ef1c45c the nightmare engine 2025-12-01 09:29:47 +01:00
George Paton
42ab196b06 structure block! 2025-12-01 13:36:31 +11:00
George Paton
a32b04ed14 all new NBTStructureLib features up to structure block (coming next) 2025-12-01 12:05:56 +11:00
HbmMods
2f841940b8
Merge pull request #2560 from RayzerHan/master
Update RU_ru lang/Qmaw
2025-11-30 22:48:16 +01:00
Bob
4141b424a9 flixes 2025-11-30 22:46:20 +01:00
Raaaaaaaaaay
afb44cd3fd
пятак гони на стол 2025-11-30 17:52:50 +02:00
Raaaaaaaaaay
096f77f3ab
танцуем с форелью 2025-11-30 17:37:55 +02:00
Raaaaaaaaaay
e2bb1e00c9
Витя станцую брейкданс на раскалённом пару 2025-11-30 17:32:28 +02:00
Raaaaaaaaaay
b43577c6cd
fix 2025-11-30 13:53:30 +02:00
Raaaaaaaaaay
818f39c1c5
fix 2025-11-29 23:46:08 +02:00
Raaaaaaaaaay
d71fee617c
ох мда 2025-11-29 23:40:32 +02:00
Raaaaaaaaaay
aa7aff5150
update QMAW, ох этот урановый концентрат 2025-11-29 23:35:32 +02:00
Raaaaaaaaaay
f6a3e44271
fix 2025-11-29 23:25:09 +02:00
Raaaaaaaaaay
6ad72b293d
update 2025-11-28 17:50:44 +02:00
Raaaaaaaaaay
bce94d0957
Merge branch 'HbmMods:master' into master 2025-11-28 17:40:11 +02:00
Boblet
3101c9b3b9 compost 2025-11-28 14:10:17 +01:00
Raaaaaaaaaay
99b19cd022
Merge branch 'HbmMods:master' into master 2025-11-28 13:08:58 +02:00
Bob
f50e0ee67c sound fix 2025-11-27 19:34:55 +01:00
HbmMods
a8c6ee4ba4
Merge pull request #2553 from Voxelstice/oc-fusion-pa
OC compat for new fusion reactor and particle accelerator
2025-11-27 16:46:18 +01:00
Voxelstice
9ab73e382f here it goes again
adds OC compat to the new fusion reactor and the particle accelerator
2025-11-27 18:17:51 +03:00
Boblet
3bdd7b4c94 evil mechanism 2025-11-27 10:51:48 +01:00
Boblet
4322892abb fugorg contraption 2025-11-26 15:50:45 +01:00
Boblet
a4a08aa9cd oughe, 2025-11-26 11:09:29 +01:00
Raaaaaaaaaay
cbff57375c
Merge branch 'HbmMods:master' into master 2025-11-26 11:00:14 +02:00
Boblet
879d9d1f8a que? 2025-11-26 08:11:55 +01:00
Raaaaaaaaaay
b9271cc81d
Merge branch 'HbmMods:master' into master 2025-11-25 16:02:14 +02:00
Boblet
fc967e8878 they took my arms 2025-11-25 13:42:02 +01:00
Boblet
7afd9901d3 no more rainbows. we homophobic now. 2025-11-25 12:49:03 +01:00
HbmMods
f91718111d
Merge pull request #2546 from NarekoMichigami810/master
zh_CN update
2025-11-25 08:29:47 +01:00
Raaaaaaaaaay
c7f5a14e42
Merge branch 'HbmMods:master' into master 2025-11-24 14:46:34 +02:00
道神 馴子
dacddfb3a1
cookie 2025-11-24 20:27:44 +08:00
Bob
4fe5128547 fusion rework in a week 2025-11-23 21:19:35 +01:00
Raaaaaaaaaay
e1cb8d00a7
Merge branch 'HbmMods:master' into master 2025-11-23 14:03:30 +02:00
Bob
2b056a8ae2 fusion breeder port fix 2025-11-23 12:47:51 +01:00
Raaaaaaaaaay
14490f9392
Merge branch 'HbmMods:master' into master 2025-11-23 11:56:39 +02:00
Bob
9aa3ac9978 plasma sparkle 2025-11-22 22:16:16 +01:00
Raaaaaaaaaay
4233a36348 fix qmaw and new ru 2025-11-21 17:47:46 +00:00
Boblet
170f155bc7 more plasmas because sure 2025-11-21 13:49:20 +01:00
Boblet
6818121b9a fusion QMAW 2025-11-21 11:24:45 +01:00
Bob
e5b93da9e4 old man yaoi 2025-11-20 21:43:57 +01:00
Boblet
71b40de7a7 the smooth taste of NEO, wake up and taste the PAIN 2025-11-20 15:59:34 +01:00
Bob
4a3db6adba magneto-plasma-sludge physics 2025-11-19 23:41:21 +01:00
Boblet
56a17c8856 NAEDOCYTE BREEDA 2025-11-19 16:57:04 +01:00
Boblet
2b5d23fbc1 blibble futuristics' greatest invention: the fugorg mechanism 2025-11-18 15:20:28 +01:00
Bob
c33d717631 the lads 2025-11-17 22:19:49 +01:00
Boblet
2e00964514 ignition 2025-11-17 16:10:19 +01:00
HbmMods
f28ebbea5c
Merge pull request #2537 from Lazzzycatwastaken/master
Fix for floating superflat structures
2025-11-17 08:24:55 +01:00
HbmMods
1d559fbfe0
Merge pull request #2538 from RayzerHan/master
ru_RU.lang and RU QMAW update
2025-11-17 08:24:21 +01:00
Bob
732f6552b6 just fucking nodespace everything at this point 2025-11-16 22:58:50 +01:00
Raaaaaaaaaay
e16a60d713
oh 2025-11-16 18:33:39 +02:00
Raaaaaaaaaay
6c4b58a192 fix 2 2025-11-16 16:30:54 +00:00
Lazzzycat
938f99318f azure latch time 2025-11-16 17:11:59 +01:00
Raaaaaaaaaay
c4c873767f
Fix 2025-11-16 18:03:58 +02:00
Raaaaaaaaaay
4b15267d4f
up 2025-11-16 17:55:05 +02:00
Raaaaaaaaaay
51380e49a7
wow 2025-11-16 17:53:10 +02:00
Raaaaaaaaaay
94db51bb37
Add files via upload
Ohh
2025-11-16 17:52:10 +02:00
Lazzzycat
84f1434131 i FUCKING HATE intellishit fuck this stupidslopware program and fuck jetbrains they can give me some brain 2025-11-16 16:26:29 +01:00
Bob
1cb8ca18cf yeah that thing too 2025-11-15 23:01:32 +01:00
Bob
de40ff388a see, you just gotta put your whole pussy into it 2025-11-15 17:19:34 +01:00
HbmMods
8ffbb512c1
Merge pull request #2536 from MellowArpeggiation/master
I CAN GO FASTER I CAN GO FASTER I CAN GO FASTER HRRRRRRRAAAAAAAAAAAA
2025-11-15 11:29:55 +01:00
George Paton
9a2a79c4c2 I CAN GO FASTER I CAN GO FASTER I CAN GO FASTER HRRRRRRRAAAAAAAAAAAA 2025-11-15 15:41:12 +11:00
Boblet
13cf418c16 mhdt 2025-11-14 15:18:07 +01:00
Bob
bb693a729d him 2025-11-13 22:19:02 +01:00
Boblet
c6a7d2aba4 my bals 2025-11-13 16:43:41 +01:00
Boblet
0c0a3c952b big chungus for playstation 3 2025-11-12 16:10:53 +01:00
HbmMods
b5fb8ae5be
Merge pull request #2530 from MellowArpeggiation/master
slag ingot slag ingot
2025-11-12 07:59:33 +01:00
George Paton
0a60e10827 remove unused imports 2025-11-12 10:05:50 +11:00
George Paton
85a0373675 fuck my chungus wife 2025-11-12 10:03:34 +11:00
HbmMods
6b30ba7d76
Merge pull request #2528 from NarekoMichigami810/master
zh_CN update
2025-11-11 19:05:21 +01:00
Boblet
f1cfe03bf3 when all of a sudden - italians 2025-11-11 16:44:06 +01:00
道神 馴子
ded4c9c53a
boy next door 2025-11-11 21:40:44 +08:00
HbmMods
0194c0d2a9
Merge pull request #2527 from sodlier/master
Fix README.md links
2025-11-11 08:04:09 +01:00
sodlier
97349a1df5
Merge pull request #1 from sodlier/readme-fix
Fix links in README.md
2025-11-10 20:14:04 -03:00
sodlier
991e3ffa1d
Fix links in README.md
Updated CurseForge link and Adoptium JDK8 download link in README.md file.

anything to put my name in the contributors tab
2025-11-10 20:09:21 -03:00
Bob
58c76bdd55 eeeeeeeeeeeeeeeeeeeeee 2025-11-10 22:07:16 +01:00
HbmMods
ab48d52265
Merge pull request #2525 from BallOfEnergy1/master
Tiny changes
2025-11-10 16:07:16 +01:00
HbmMods
eaf0cfa24a
Merge pull request #2521 from mikkerlo/push-tumznvpzvzqq
Stop mining laser if redstone is supplied.
2025-11-10 16:06:52 +01:00
Boblet
f7d2038f7e some AStack crap, fusion torus struct block 2025-11-10 15:37:35 +01:00
BallOfEnergy
ada5ccbf77
github what made you think i wanted to commit only the additions??? 2025-11-09 22:51:21 -06:00
BallOfEnergy
252659bdf0
My life is a living hell, and this will make it significantly less horrible. 2025-11-09 22:45:00 -06:00
Boblet
bc1073f734 donuts 2025-11-07 14:44:52 +01:00
Bob
9386e9d186 ough part 23 2025-11-06 22:16:08 +01:00
Boblet
a8c24cf76a glontch 2025-11-06 15:39:45 +01:00
Mikhail Semenov
6e7be25614 Stop mining laser if redstone is supplied. 2025-11-06 07:07:13 +01:00
Boblet
8b88d0f439 demoman TF2 2025-11-05 16:54:03 +01:00
Boblet
82185aa9ca what if you wanted to go to heaven, but god said "ough," 2025-11-04 16:18:12 +01:00
Boblet
b2d52e8cfa you can now cut off big man johnson's johnson 2025-11-03 16:34:31 +01:00
Bob
b278d27b9b malicious gigglefish from the silly dimension 2025-11-02 18:43:12 +01:00
Boblet
036c220317 RoR can have QMAW as a treat 2025-10-31 14:52:28 +01:00
HbmMods
a3fbb711f0
Merge pull request #2513 from MellowArpeggiation/master
fix crash in Highlands mod due to it using a deprecated biome hook
2025-10-31 09:07:59 +01:00
George Paton
09dd5e37b5 nodespace foundry channels! (also fix arc furnace only accepting one stack from IO port if it triggers it to close) 2025-10-31 14:33:09 +11:00
George Paton
176a2e58ee fix crash in highlands mod due to it using a deprecated biome hook 2025-10-31 13:00:40 +11:00
Boblet
18dabf7e8c go go gadget ovarial torsion 2025-10-30 16:40:58 +01:00
HbmMods
113a800270
Merge pull request #2509 from t3435ryt/master
Rail block harvest tools and levels
2025-10-30 10:15:56 +01:00
t3435ryt
311a9d1a31
Merge branch 'HbmMods:master' into master 2025-10-29 13:07:49 -04:00
t3435ryt
b6c60f5997 For a number of years now, work has been proceeding in order to bring perfection to the crudely conceived idea of a transmission that would not only supply inverse reactive current for use in unilateral phase detractors, but would also be capable of automatically synchronizing cardinal grammeters. Such an instrument is the turbo encabulator.
Now basically the only new principle involved is that instead of power being generated by the relative motion of conductors and fluxes, it is produced by the modial interaction of magneto-reluctance and capacitive diractance.

The original machine had a base plate of pre-famulated amulite surmounted by a malleable logarithmic casing in such a way that the two spurving bearings were in a direct line with the panametric fan. The latter consisted simply of six hydrocoptic marzlevanes, so fitted to the ambifacient lunar waneshaft that side fumbling was effectively prevented.

The main winding was of the normal lotus-o-delta type placed in panendermic semi-boloid slots of the stator, every seventh conductor being connected by a non-reversible tremie pipe to the differential girdle spring on the “up” end of the grammeters.

The turbo-encabulator has now reached a high level of development, and it’s being successfully used in the operation of novertrunnions. Moreover, whenever a forescent skor motion is required, it may also be employed in conjunction with a drawn reciprocation dingle arm, to reduce sinusoidal repleneration.
2025-10-29 13:06:38 -04:00
Bob
76d4a4a453 you can have like half a UV 2025-10-28 22:18:20 +01:00
HbmMods
0a6bddc83d
Merge pull request #2507 from mikkerlo/push-zkltxruskxvq
Change Builders Jetpack shift space behavior
2025-10-28 14:19:56 +01:00
Mikhail Semenov
efc5a88928 Change Builders Jetpack shift space behavior
Currently, pressing Shift+Space causes the jetpack to ascend, which I believe is unintentional.
This change makes that key combination do nothing.
2025-10-28 00:05:36 +01:00
Boblet
02ee44e1ce boner 2025-10-27 16:58:21 +01:00
HbmMods
9e5c4e4a8e
Merge pull request #2505 from MellowArpeggiation/boxcable
I've lost count of the number of times I've done this
2025-10-27 09:44:27 +01:00
George Paton
14d79d426c FUCK 2025-10-27 19:36:25 +11:00
HbmMods
03f8b2d80a
Merge pull request #2504 from MellowArpeggiation/boxcable
Boxcables!
2025-10-27 08:25:32 +01:00
George Paton
7161a1ef73 improve junction connections and add better textures 2025-10-27 16:35:36 +11:00
George Paton
2833d58e84 adjust cable hitboxes and make them look more like red copper 2025-10-27 14:09:04 +11:00
George Paton
6eeefc23b4 add OC support to PA dipoles 2025-10-27 13:51:26 +11:00
t3435ryt
9ce0c0ec39 For a number of years now, work has been proceeding in order to bring perfection to the crudely conceived idea of a transmission that would not only supply inverse reactive current for use in unilateral phase detractors, but would also be capable of automatically synchronizing cardinal grammeters. Such an instrument is the turbo encabulator.
Now basically the only new principle involved is that instead of power being generated by the relative motion of conductors and fluxes, it is produced by the modial interaction of magneto-reluctance and capacitive diractance.

The original machine had a base plate of pre-famulated amulite surmounted by a malleable logarithmic casing in such a way that the two spurving bearings were in a direct line with the panametric fan. The latter consisted simply of six hydrocoptic marzlevanes, so fitted to the ambifacient lunar waneshaft that side fumbling was effectively prevented.

The main winding was of the normal lotus-o-delta type placed in panendermic semi-boloid slots of the stator, every seventh conductor being connected by a non-reversible tremie pipe to the differential girdle spring on the “up” end of the grammeters.

The turbo-encabulator has now reached a high level of development, and it’s being successfully used in the operation of novertrunnions. Moreover, whenever a forescent skor motion is required, it may also be employed in conjunction with a drawn reciprocation dingle arm, to reduce sinusoidal repleneration.
2025-10-26 22:05:46 -04:00
George Paton
f9baf87289 fix PA dipole max speed penalty applying to particles that aren't turning 2025-10-27 12:42:13 +11:00
George Paton
bff3e15fb3 boxcable recipe (uses ingots for now) 2025-10-27 12:41:24 +11:00
George Paton
f297d4f856 what the fuc kis a boxcable 2025-10-27 12:30:17 +11:00
Bob
3b55d26e17 he sings 2025-10-24 22:05:04 +02:00
Boblet
dfd1aafb89 compressor QMAW 2025-10-24 11:13:49 +02:00
Boblet
75adc232f7 particle accelerator QMAW 2025-10-23 15:12:10 +02:00
HbmMods
d6f957f975
Merge pull request #2491 from mikkerlo/master
Add NEI overlay functionality so recipe on anvil can be selected via NEI.
2025-10-23 12:03:42 +02:00
Boblet
f9baf88f3c cleanup 2025-10-23 12:02:55 +02:00
HbmMods
b3aa9ab637
Merge pull request #2483 from DangerousMilk/Meteorite-Tweaks
Meteor Improvements
2025-10-23 11:55:37 +02:00
DangerousMilk
c8a0b7f89a Fixed stopping the meteor flying sound without ever initializing it. Fixed meteors destroying bedrock. Added a hardness limit to which blocks that can be replaced. 2025-10-22 21:19:22 +02:00
DangerousMilk
193f011619 Remove vlc-log 2025-10-22 20:36:38 +02:00
DangerousMilk
f2e733679c Simplified block clearing and decoration. 2025-10-22 20:36:38 +02:00
DangerousMilk
2f7c013423 Cleanup. 2025-10-22 20:36:38 +02:00
DangerousMilk
5a987621a5 Added impact crater decorations. Meteors now go into the ground on impact. Refactored some functions. 2025-10-22 20:36:37 +02:00
DangerousMilk
e7b3dff934 Fixed flySound NullPointerException. 2025-10-22 20:36:37 +02:00
DangerousMilk
51b1f3e46d Fixed the short 'blip' of the fly sound being player at the start. 2025-10-22 20:36:37 +02:00
DangerousMilk
c3c0be94e3 Made the destruction of weak blocks safe. More sound tweaks 2025-10-22 20:36:37 +02:00
DangerousMilk
f87a23d494 Deleted vlc-log.txt. 2025-10-22 20:36:37 +02:00
DangerousMilk
59ace7eaf5 Added meteorite falling sound. 2025-10-22 20:36:37 +02:00
DangerousMilk
bd8ed4920d Meteorites now break leaves and logs before landing. Made explosions fit the meteor size more. 2025-10-22 20:36:37 +02:00
Boblet
72957ef167 speedrun 2025-10-22 15:41:26 +02:00
HbmMods
b3b05d9208
Merge pull request #2492 from NarekoMichigami810/master
zh_CN update
2025-10-22 14:43:53 +02:00
道神 馴子
2d593dbeb3
Masturbate 2025-10-22 19:27:15 +08:00
Bob
cde2d39631 i'm creekflow (crashes into a mcdonalds drive thru) 2025-10-21 23:09:30 +02:00
HbmMods
38cd74536d
Merge pull request #2478 from Fyrstikkeske/master
Retain unused progress for the next craft on the blast furnace
2025-10-21 22:06:15 +02:00
Mikhail Semenov
e16be434f5 Add NEI overlay functionality so recipe on anvil can be selected via NEI.
This will allow to click plus-sign in NEI and NEI will select recipe on Anvil automatically.
2025-10-21 21:56:48 +02:00
Bob
3bf9ab1570 pneumonia 2025-10-21 21:55:14 +02:00
Boblet
bbe41c02a7 i forgor 2025-10-21 16:27:50 +02:00
Boblet
10cf45b452 "release today" and other jokes to tell yourself, volume IV 2025-10-20 16:59:54 +02:00
Boblet
907d389b43 ey jimmy, gimme a weapon mod with NOTHIN'
nuttin'??
2025-10-17 15:18:11 +02:00
Bob
ec076fb97a now with sound 2025-10-16 23:51:35 +02:00
Boblet
12e8da8750 eggplant emoji, droplets emoji, weary face emoji 2025-10-16 15:47:40 +02:00
Boblet
4d6a92e015 i think i may have creeked my flow 2025-10-15 15:13:59 +02:00
Boblet
5fd64f5d8f the thing, device 2025-10-14 16:50:39 +02:00
Boblet
fe38e61ba4 drilldo 2025-10-13 16:47:39 +02:00
Bob
db9b0501d5 conveyor stuff, yet more drill crap 2025-10-12 21:42:18 +02:00
Boblet
40a14fb440 automatic prostate exam device 2025-10-10 14:56:28 +02:00
Fyrstikkeske
6f7a23d8cc Retain unused progress for the next craft
fixes some alignment issues when minmaxxing the blast furnace.
2025-10-10 00:35:13 +02:00
Boblet
db3f58b4cd just throw a continental breakfast at my face 2025-10-09 16:57:31 +02:00
Bob
a0670eb700 anchor deez nuts ha gotem 2025-10-08 22:59:28 +02:00
Boblet
6304df71dd more plumbing, get your free toilet now 2025-10-08 16:58:39 +02:00
HbmMods
d1c5355362
Merge pull request #2475 from MellowArpeggiation/bubble-butt
Remove all remaining non-structure worldgen cascades
2025-10-08 10:28:38 +02:00
Boblet
801fdc146c scrungus 2025-10-07 16:30:21 +02:00
George Paton
7d6fea7646 fix semi-flipped oily spot gaussian distribution 2025-10-07 17:52:25 +11:00
George Paton
39603e2edb bedrock oil spots 2025-10-07 15:33:40 +11:00
George Paton
edbc062da0 reimplement oil (regular + sand) bubbles as MapGenBase 2025-10-07 12:56:14 +11:00
Boblet
054aa07318 my bals 2025-10-06 16:42:34 +02:00
George Paton
264ee49212 replace sellafield craters (already had the crater code so why not) 2025-10-06 18:38:01 +11:00
HbmMods
32c0491ca4
Merge pull request #2436 from Bufka2011/master
ru_RU.lang and RU QMAW update
2025-10-06 07:59:48 +02:00
HbmMods
3ca0e1ad4c
Merge pull request #2456 from NarekoMichigami810/master
zh_CN update
2025-10-06 07:56:36 +02:00
HbmMods
59afb41c22
Merge pull request #2449 from kelllllen/master
Some more RBMK OC compat
2025-10-06 07:56:14 +02:00
HbmMods
ab7c852d61
Merge pull request #2473 from MellowArpeggiation/master
common worldgen cascade fixes (improved worldgen performance)
2025-10-06 07:52:22 +02:00
George Paton
15d7edacb5 bonus: fix chargers never filling the last 1HE on certain armors 2025-10-06 13:34:36 +11:00
George Paton
278a7b5dfb fixing two common worldgen cascades in meteorites and flowers 2025-10-06 12:21:24 +11:00
Bob
4ef2442770 drill crap 2025-10-05 23:48:03 +02:00
Bufka2011
bbf3d29d80
Update ru_RU.lang 2025-10-04 11:50:21 -06:00
Bufka2011
8cc94738ad
Update ru_RU.lang 2025-10-04 11:48:37 -06:00
Bufka2011
ee79c8d9dc
Update ru_RU.lang 2025-10-04 11:37:29 -06:00
Bufka2011
97cb4cb6a1
Update ru_RU.lang 2025-10-04 11:26:49 -06:00
Bufka2011
9a42d65e26
Update ru_RU.lang 2025-10-04 11:21:18 -06:00
Bufka2011
f3e315297a
Update ru_RU.lang 2025-10-04 11:13:11 -06:00
Bufka2011
b1d4e99ea9
Update ru_RU.lang 2025-10-04 11:08:22 -06:00
Bufka2011
40dc8c8679
Update ru_RU.lang 2025-10-04 11:01:14 -06:00
Bufka2011
63fbbeb5c7
Update ru_RU.lang 2025-10-04 10:58:26 -06:00
Bufka2011
669c2b9b50
Update ru_RU.lang 2025-10-04 10:53:58 -06:00
Bufka2011
62366d5adb
Update ru_RU.lang 2025-10-04 10:53:06 -06:00
Bufka2011
8b6af76fa0
Update ru_RU.lang 2025-10-04 10:43:29 -06:00
Bufka2011
abe22b7f97
Update ru_RU.lang 2025-10-04 10:42:28 -06:00
Bufka2011
111f0d1114
Update ru_RU.lang 2025-10-04 10:40:56 -06:00
Bufka2011
0f5b5837b8
Update ru_RU.lang 2025-10-04 10:27:29 -06:00
Bufka2011
2796bcb892
Update ru_RU.lang 2025-10-04 10:24:32 -06:00
Bufka2011
540cf425e9
Update ru_RU.lang 2025-10-04 10:22:17 -06:00
Bufka2011
31a9000a82
Merge branch 'HbmMods:master' into master 2025-10-02 13:28:46 -06:00
Bufka2011
4710fcfc34
Update ru_RU.lang 2025-09-30 18:13:58 -06:00
Bob
9ba40044ed nothing 2025-09-28 14:35:04 +02:00
道神 馴子
bb056af18d
Merge branch 'HbmMods:master' into master 2025-09-28 14:14:28 +08:00
Bob
b710b88ed5 eh 2025-09-27 19:24:27 +02:00
Bufka2011
995f987e66
Update hss.json 2025-09-27 11:09:40 -06:00
Bufka2011
a709db58bb
Merge branch 'HbmMods:master' into master 2025-09-27 11:01:38 -06:00
Bufka2011
4f97af940c
Update ru_RU.lang 2025-09-27 11:01:25 -06:00
Boblet
a08c410a9c alt recipes galore 2025-09-26 14:12:16 +02:00
道神 馴子
a030397f71
Add files via upload 2025-09-26 20:06:36 +08:00
Boblet
a0184b1751 military green paint(?) 2025-09-25 16:45:10 +02:00
KellenHurrey
640397fdda
Merge branch 'HbmMods:master' into master 2025-09-22 15:26:50 -07:00
Kellen Hurrey
6f314c3996
Added more info to getColumnData, added control rod targets 2025-09-22 16:25:34 -06:00
Boblet
f389a25dec just fucking 3D everything i don't care anymore 2025-09-22 16:49:43 +02:00
HbmMods
bc7e00c71c
Merge pull request #2441 from Lazzzycatwastaken/crane
Crane Structure
2025-09-22 11:34:15 +02:00
HbmMods
2d64453317
Merge branch 'master' into crane 2025-09-22 11:34:08 +02:00
Boblet
c9155b55ba maybe i should push before something breaks completely 2025-09-22 11:32:20 +02:00
HbmMods
dfa1d7718b
Merge pull request #2442 from Lazzzycatwastaken/tower
Broadcaster tower
2025-09-22 11:31:39 +02:00
HbmMods
6a7acb337e
Merge pull request #2448 from MellowArpeggiation/master
Show current tool area ability next to crosshair
2025-09-22 11:28:42 +02:00
George Paton
f082094740
big dumbass momento 2025-09-22 19:16:15 +10:00
George Paton
c8fe3cc095 add client config to adjust tool hud indicator position 2025-09-22 17:33:35 +10:00
George Paton
dd3746a3d4
Merge branch 'HbmMods:master' into master 2025-09-22 17:15:02 +10:00
George Paton
dd0a604aa6 show current tool area ability next to crosshair, to prevent accidentally breaking yo shit 2025-09-22 17:14:28 +10:00
HbmMods
7285867856
Merge pull request #2443 from KellenHurrey/master
Some RBMK OC integration
2025-09-21 21:04:09 +02:00
HbmMods
b57acc2cb2
Merge pull request #2446 from BallOfEnergy1/master
Fix for TE crashes when using neutron nodespace.
2025-09-21 21:01:58 +02:00
Bob
d67b3778c3 this is the part where the T-45 fucking dies 2025-09-21 20:58:56 +02:00
BallOfEnergy
4440550a37 Small fix for erroneous crashes. 2025-09-21 10:20:23 -05:00
Bufka2011
644e188a94
Update ru_RU.lang 2025-09-20 15:24:58 -06:00
Bufka2011
72026cb772
Update ru_RU.lang 2025-09-20 15:19:17 -06:00
Bufka2011
072f226181
Merge branch 'HbmMods:master' into master 2025-09-20 10:15:44 -06:00
Kellen Hurrey
9f849e8c2d
Removed unused import 2025-09-19 11:28:19 -06:00
Kellen Hurrey
cf5bf4be8c
Added crafting data to getData and getColumnData, and made the OC pressAZ5 function play the cool sound 2025-09-19 11:25:11 -06:00
Kellen Hurrey
890eb49747
Merge remote-tracking branch 'origin/master' 2025-09-19 10:52:15 -06:00
Kellen Hurrey
ebd7ffc827
Make RBMK slotted elements have OC accessible inventories, and added a OC outgasser function that allows seeing the item that is being processed. 2025-09-19 10:51:32 -06:00
Lazzzycatwastaken
eddd75a626 When I get pantsd in class but I lowkey got a humiliation kink so I get bricked up and everyone realizes im lowkey slanging and hypes me up so I start helicoptering it on some nonchalant shi 2025-09-19 17:53:33 +02:00
Boblet
b3405d085b the skeleton's coming out, AAAAAAAAAAAAA 2025-09-19 13:02:50 +02:00
Lazzzycat
003721d4f7
creed embled unemployed drone 2025-09-19 11:50:48 +02:00
Lazzzycat
f3345f7778
Merge branch 'HbmMods:master' into crane 2025-09-19 09:31:59 +02:00
HbmMods
94e3df1751
Merge pull request #2440 from MellowArpeggiation/drilldo
This was an animated terra drill PR but the drill is getting axed so this is now just a bugfix and cleanup PR yay
2025-09-19 08:09:56 +02:00
HbmMods
d01016034f
Merge pull request #2438 from Lazzzycatwastaken/ttttt
Structure configs
2025-09-19 07:59:26 +02:00
George Paton
f7ffc694bf retract drill upon hitting depth rock 2025-09-19 12:27:10 +10:00
George Paton
7113838d68 add compact compressor to NEI handler 2025-09-19 12:08:00 +10:00
Bufka2011
96e5ea531c
Fix ru_RU.lang 2025-09-18 13:33:12 -06:00
Bufka2011
c25adf5014
Merge branch 'HbmMods:master' into master 2025-09-18 13:31:33 -06:00
Lazzzycatwastaken
f499e6cf00 setro OWNS me... (we've lost the plot) 2025-09-18 21:25:40 +02:00
Lazzzycatwastaken
daae6e9694 peak meter 100% 2025-09-18 20:17:32 +02:00
HbmMods
0916aa9b17
Merge pull request #2437 from Lazzzycatwastaken/factory
Factory rework
2025-09-18 16:51:43 +02:00
Lazzzycatwastaken
d6a10bf49a removed the parasite (title screen) 2025-09-18 16:27:03 +02:00
Lazzzycat
1f09f64176
Merge branch 'HbmMods:master' into factory 2025-09-18 16:13:38 +02:00
Lazzzycatwastaken
3dc97e8133 mr. penis (real) 2025-09-18 16:13:10 +02:00
Boblet
aaa046e4eb mischief 2025-09-18 16:08:27 +02:00
George Paton
2ffe3d0072 fix entity registration, complete with functioning spawn eggs 2025-09-18 13:12:42 +10:00
Boblet
715ecda0dd ough 2025-09-17 16:11:28 +02:00
Bufka2011
c61d7f4f89
Small ru_RU.lang fix 2025-09-15 21:16:29 -06:00
George Paton
2efce806a9 aim IAnimatedItem like a bow 2025-09-16 09:52:52 +10:00
Boblet
b9fabc3af4 ow 2025-09-15 16:27:29 +02:00
George Paton
dbd63e706f Merge branch 'master' into drilldo 2025-09-15 11:00:14 +10:00
George Paton
a79125b94d generic animation enum selection, still item specific but now a lot easier to refactor to non-item animations 2025-09-15 10:57:05 +10:00
Bob
afb559d604 sparks! 2025-09-14 22:51:27 +02:00
Boblet
c0cb28c2ad every step we take that's synchronized 2025-09-12 11:03:27 +02:00
George Paton
ada1b5245d might as well fix two issues while here:
* electrolyser metal outputs not clearing on client
* unused chunk allocation wasting RAM
2025-09-12 17:12:06 +10:00
George Paton
8c752488ee improve IAnimatedItem and move existing item animations out of the ClientProxy monolith 2025-09-12 14:39:38 +10:00
Bob
4a4606e6ed the sludge 2025-09-11 22:57:20 +02:00
HbmMods
7916d76aca
Merge pull request #2424 from R0STUS/master
PWRangler garbage improvements
2025-09-11 16:29:34 +02:00
HbmMods
463d020dad
Merge pull request #2426 from KellenHurrey/master
Add a oc function to set the custom map of redstone over radio torches
2025-09-11 16:28:07 +02:00
Boblet
4805dd800c the slow dance (it's actually rather fast) 2025-09-10 16:30:13 +02:00
Boblet
4320071a41 sesbian lex 2025-09-09 16:58:17 +02:00
Boblet
07a2e4eea3 tragic yuri 2025-09-08 16:54:05 +02:00
rost
d7f859ecab Final commit (max level added) 2025-09-08 16:03:40 +02:00
Kellen Hurrey
f6c74ce98e
Add radio method 2025-09-07 19:16:42 -06:00
Bob
966206dbf5 getting there 2025-09-07 20:53:12 +02:00
rost
675cde7321 fixes; MAX LEVEL REQUIRED 2025-09-07 14:51:23 +02:00
rost
98cf0b002b hot coolant ESTOP; MAX LEVEL REQUIRED 2025-09-07 11:14:30 +02:00
rost
3ff201bf4d fixes 2025-09-06 22:40:47 +02:00
rost
81c5bb84d3 upd 2025-09-06 22:35:29 +02:00
rost
1025f626b7 PWRangler garbage impoovments 2025-09-06 22:21:41 +02:00
HbmMods
13df9566a2
Merge pull request #2422 from Creeper-banner/bob
Update Simplified Chinese Localization for new QMAW pages
2025-09-06 16:54:28 +02:00
Bob
99aa9da490 flixes 2025-09-06 16:54:12 +02:00
CrpBnrz
465b521f19 QMAW Fix 2025-09-06 22:37:02 +08:00
CrpBnrz
0cea7393a6 More QMAW 2025-09-06 21:12:50 +08:00
CrpBnrz
7096062847 Merge branch 'bob' of https://github.com/Creeper-banner/NTMC.git into bob 2025-09-06 13:07:52 +08:00
CrpBnrz
2b612e82e9 Oil QMAW 2025-09-06 13:04:29 +08:00
Boblet
e03ad3edfb the docs 2025-09-05 15:17:05 +02:00
HbmMods
a35cb1cbd5
Merge pull request #2417 from Creeper-banner/bob
Update Simplified Chinese Localization
2025-09-04 16:56:47 +02:00
Boblet
2ed4d906c3 QMAW! 2025-09-04 16:35:34 +02:00
Creeper-banner
d4844073ae
Update zh_CN.lang 2025-09-04 22:26:01 +08:00
CrpBnrz
fba1d2a97b Update zh_CN.lang 2025-09-04 21:50:42 +08:00
CrpBnrz
45af851032 QMAW localization for free (but not for me) 2025-09-04 21:44:49 +08:00
Boblet
94accf6ed6 more QMAW for free 2025-09-03 16:25:29 +02:00
Boblet
539ecb8130 deplorable gollompus 2025-09-02 16:18:58 +02:00
Boblet
3f38c9b7d2 chlog 2025-09-01 16:43:37 +02:00
HbmMods
8f67cb6ba3
Merge pull request #2409 from MellowArpeggiation/master
fuck
2025-09-01 09:44:09 +02:00
George Paton
9a6cebe0fa stop staring at me with them big ol' eyes.
*SHHHHOOONK*
2025-09-01 17:39:27 +10:00
Boblet
ff75e7662e and then i went to the store to buy some gloop 2025-09-01 09:35:41 +02:00
Bob
7e01544c19 fresh from the juice, fresh from the juice! don't get it on your shoese 2025-08-31 15:35:43 +02:00
Bob
4e0171159e minor merge fuckup 2025-08-31 13:15:34 +02:00
HbmMods
f005680cc1
Merge pull request #2404 from Lazzzycatwastaken/forestchem
Forest chemical station
2025-08-31 13:12:07 +02:00
HbmMods
eb0dd854f0
Merge branch 'master' into forestchem 2025-08-31 13:11:54 +02:00
HbmMods
2f12549464
Merge pull request #2400 from Lazzzycatwastaken/Forwetst
Planes (useless edition)
2025-08-31 13:10:51 +02:00
HbmMods
174ce22da3
Merge branch 'master' into Forwetst 2025-08-31 13:10:45 +02:00
HbmMods
5604fa5e4a
Merge pull request #2403 from Lazzzycatwastaken/fixfordesert
Explosive suprise
2025-08-31 13:10:12 +02:00
HbmMods
bb453ce45b
Merge branch 'master' into fixfordesert 2025-08-31 13:09:19 +02:00
HbmMods
b6e9d36301
Merge branch 'master' into forestchem 2025-08-31 13:07:57 +02:00
HbmMods
a0ff23a4d1
Merge pull request #2406 from Lazzzycatwastaken/labolatory
new labolarotyyu
2025-08-31 13:07:11 +02:00
HbmMods
b456275016
Merge branch 'master' into labolatory 2025-08-31 13:07:02 +02:00
HbmMods
4d5f88896a
Merge pull request #2405 from Lazzzycatwastaken/forestpost
Forest post
2025-08-31 13:05:22 +02:00
HbmMods
6215b32f4d
Merge branch 'master' into forestpost 2025-08-31 13:00:15 +02:00
HbmMods
be78cf3a43
Merge pull request #2399 from Lazzzycatwastaken/NTMRUINS1
Sludgening is beginning
2025-08-31 12:58:38 +02:00
HbmMods
97866f1fb9
Merge branch 'master' into NTMRUINS1 2025-08-31 12:58:28 +02:00
HbmMods
1be5127582
Merge pull request #2402 from Lazzzycatwastaken/Radio-house
Radio rework (shocker)
2025-08-31 12:57:42 +02:00
HbmMods
53a63a28aa
Merge pull request #2407 from MellowArpeggiation/inventory-pronter
PWR printing tool
2025-08-31 12:49:36 +02:00
HbmMods
37926a6b8f
Merge branch 'master' into inventory-pronter 2025-08-31 12:49:30 +02:00
Bob
53d1323604 i lied, get fucked 2025-08-31 12:08:19 +02:00
Boblet
4fba0fc42a i forgor 2025-08-29 15:18:26 +02:00
George Paton
45aab4617a
Merge branch 'master' into inventory-pronter 2025-08-28 22:23:10 +10:00
George Paton
a636440d13 rotate to always show controller at bottom right 2025-08-28 15:47:22 +10:00
George Paton
c978fa8955 PWR printing device, exports a built PWR as a series of slices to be edited together for posting 2025-08-28 15:01:39 +10:00
Lazzzycatwastaken
66971b3310 SIX @SEVEN 2025-08-27 17:36:40 +02:00
Lazzzycatwastaken
92d4232472 Merge branch 'ttttt' into NTMRUINS1
# Conflicts:
#	src/main/java/com/hbm/util/LootGenerator.java
#	src/main/java/com/hbm/world/gen/NTMWorldGenerator.java
2025-08-27 17:31:40 +02:00
Lazzzycatwastaken
ee9c69cfca resolve hopefully i hope 2025-08-27 17:30:05 +02:00
Lazzzycatwastaken
5bde7c9a0d Merge branch 'ttttt' into Forwetst
# Conflicts:
#	src/main/java/com/hbm/world/gen/NTMWorldGenerator.java
2025-08-27 17:29:13 +02:00
Lazzzycatwastaken
848ac39463 resolve hopefully i hope 2025-08-27 17:24:58 +02:00
Lazzzycatwastaken
b9418dcb2e Merge branch 'ttttt' into Radio-house
# Conflicts:
#	src/main/java/com/hbm/world/gen/NTMWorldGenerator.java
2025-08-27 17:23:49 +02:00
Lazzzycatwastaken
245dbf421c Merge remote-tracking branch 'origin/forestchem' into forestchem 2025-08-27 17:21:19 +02:00
Lazzzycatwastaken
0b28311374 resolve hopefully i hope 2025-08-27 17:20:51 +02:00
Lazzzycatwastaken
c20a90e45c Merge branch 'ttttt' into forestchem
# Conflicts:
#	src/main/java/com/hbm/world/gen/NTMWorldGenerator.java
2025-08-27 17:18:42 +02:00
Lazzzycatwastaken
9a7f991092 resolve hopefully i hope 2025-08-27 17:16:07 +02:00
Lazzzycatwastaken
a24bed5337 Merge branch 'ttttt' into labolatory
# Conflicts:
#	src/main/java/com/hbm/world/gen/NTMWorldGenerator.java
2025-08-27 17:15:15 +02:00
Lazzzycatwastaken
bf3e795a66 BOIIIIIIIIIIIIIIIIII TS (type soul) getting a 20 hog code ( setro and minors? like in minecraft? I know nothing of association with setro and minors.) 2025-08-27 16:36:25 +02:00
Lazzzycatwastaken
76b51ebca9 BOIIIIIIIIIIIIIIIIII TS (type soul) getting a 20 hog code ( setro and minors? like in minecraft? I know nothing of association with setro and minors.) 2025-08-27 16:04:30 +02:00
Lazzzycatwastaken
c8bf809e9f labubu funk 2025-08-27 15:28:38 +02:00
Lazzzycatwastaken
7084dc919a Merge remote-tracking branch 'origin/NTMRUINS1' into NTMRUINS1 2025-08-27 15:13:07 +02:00
Lazzzycatwastaken
b98c8c3f98 sdsa 2025-08-27 15:12:47 +02:00
HbmMods
3f6e758cd4
Merge pull request #2397 from Bufka2011/master
ru_RU.lang update, ru_RU QMAW update and many I18n implementations (again)
2025-08-27 08:23:21 +02:00
George Paton
a000347877 yeah I was overcomplicating that, this is much better 2025-08-27 13:38:43 +10:00
George Paton
e5b29e3352 fix transparent pixel issue in wiki icon screenshitter 2025-08-27 13:12:01 +10:00
Bufka2011
5605a9c3b8 Minor changes 2025-08-26 16:25:11 -06:00
Bufka2011
708879c276 Minor ru_RU.lang changes 2025-08-26 16:21:33 -06:00
Bufka2011
95e1c97781 https://imgur.com/a/IBLwDde 2025-08-26 14:18:07 -06:00
Bufka2011
cac17dea98 Merge branch 'master' of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT 2025-08-26 10:15:07 -06:00
Boblet
03d195fd91 ough 2025-08-26 15:49:27 +02:00
Bufka2011
2eecf17100 DODD 2025-08-25 15:52:58 -06:00
Bufka2011
48b4124c14 Manual update 2025-08-25 15:52:45 -06:00
Bufka2011
23669e6337 YES, MY QMAW (used python for this) 2025-08-25 15:14:30 -06:00
Bufka2011
6ed83ab7ec Updated swords translations 2025-08-25 14:13:45 -06:00
Bufka2011
2b3f98a850 Merge branch 'master' of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT
# Conflicts:
#	src/main/resources/assets/hbm/manual/material/alloy.json
#	src/main/resources/assets/hbm/manual/material/aluminium.json
#	src/main/resources/assets/hbm/manual/material/arsenic.json
#	src/main/resources/assets/hbm/manual/material/arsenic_bronze.json
#	src/main/resources/assets/hbm/manual/material/bakelite.json
#	src/main/resources/assets/hbm/manual/material/bismuth.json
#	src/main/resources/assets/hbm/manual/material/bismuth_bronze.json
#	src/main/resources/assets/hbm/manual/material/bscco.json
#	src/main/resources/assets/hbm/manual/material/cadmium.json
#	src/main/resources/assets/hbm/manual/material/cadmium_steel.json
#	src/main/resources/assets/hbm/manual/material/cinnabar.json
#	src/main/resources/assets/hbm/manual/material/coke.json
#	src/main/resources/assets/hbm/manual/material/copper.json
#	src/main/resources/assets/hbm/manual/material/desh.json
#	src/main/resources/assets/hbm/manual/material/ferrouranium.json
#	src/main/resources/assets/hbm/manual/material/graphite.json
#	src/main/resources/assets/hbm/manual/material/gunmetal.json
#	src/main/resources/assets/hbm/manual/material/hss.json
#	src/main/resources/assets/hbm/manual/material/latex.json
#	src/main/resources/assets/hbm/manual/material/lead.json
#	src/main/resources/assets/hbm/manual/material/mingrade.json
#	src/main/resources/assets/hbm/manual/material/neptunium.json
#	src/main/resources/assets/hbm/manual/material/plutonium-238.json
#	src/main/resources/assets/hbm/manual/material/plutonium-239.json
#	src/main/resources/assets/hbm/manual/material/plutonium-240.json
#	src/main/resources/assets/hbm/manual/material/plutonium-241.json
#	src/main/resources/assets/hbm/manual/material/plutonium-rg.json
#	src/main/resources/assets/hbm/manual/material/plutonium.json
#	src/main/resources/assets/hbm/manual/material/polonium.json
#	src/main/resources/assets/hbm/manual/material/polymer.json
#	src/main/resources/assets/hbm/manual/material/radium.json
#	src/main/resources/assets/hbm/manual/material/rubber.json
#	src/main/resources/assets/hbm/manual/material/silicon.json
#	src/main/resources/assets/hbm/manual/material/sodium.json
#	src/main/resources/assets/hbm/manual/material/steel.json
#	src/main/resources/assets/hbm/manual/material/sulfur.json
#	src/main/resources/assets/hbm/manual/material/tantalium.json
#	src/main/resources/assets/hbm/manual/material/technetium.json
#	src/main/resources/assets/hbm/manual/material/technetium_steel.json
#	src/main/resources/assets/hbm/manual/material/thorium.json
#	src/main/resources/assets/hbm/manual/material/uranium-233.json
#	src/main/resources/assets/hbm/manual/material/uranium-235.json
#	src/main/resources/assets/hbm/manual/material/uranium-238.json
#	src/main/resources/assets/hbm/manual/material/uranium.json
#	src/main/resources/assets/hbm/manual/material/weaponsteel.json
2025-08-25 13:56:07 -06:00
Bufka2011
fcabf659af To be translated 2025-08-25 13:42:17 -06:00
Bufka2011
742595c83f I18n implementation for Meteorite Swords and Dusted Steel 2025-08-25 13:35:25 -06:00
Bufka2011
e062b4d2c3 More manual fixes 2025-08-25 13:34:06 -06:00
Bufka2011
a2a91d929a QMAW again 2025-08-25 12:47:43 -06:00
Bufka2011
7e87efcc48 QMAW 2025-08-25 12:44:22 -06:00
Bufka2011
61e10fe48f I'm tired of fixing 2025-08-25 12:25:05 -06:00
Bufka2011
518871bf2b Polonium fix 2025-08-25 12:24:33 -06:00
Bufka2011
b75e14d9fc Reader fixed 2025-08-25 12:11:43 -06:00
Bufka2011
12d2d6b8dd Fixed QMAW again 2025-08-25 12:10:30 -06:00
Bufka2011
37279845be Fixes 2025-08-25 12:02:16 -06:00
Bufka2011
d6b095c568 Fix 2025-08-25 11:36:31 -06:00
Bufka2011
f7cf05d944 QMAW desh fix 2025-08-25 11:35:20 -06:00
Bufka2011
3cbc342af5 Red copper 2025-08-25 11:23:12 -06:00
Bufka2011
ee41e9a7ed QMAW fixes 2025-08-25 11:22:43 -06:00
Bufka2011
79074e19c2 Ferrouranium 2025-08-25 11:12:51 -06:00
Bufka2011
ad9cb55b98 More QMAW fixes 2025-08-25 11:10:35 -06:00
Bufka2011
d71057bbab QMAW fixes 2025-08-25 11:08:54 -06:00
Bufka2011
8033fde2b9 Aluminium manual fix 2025-08-25 10:52:30 -06:00
Bufka2011
b209795f60 Rangefinder 2025-08-25 10:49:22 -06:00
Bufka2011
f73d81310a Minor changes 2025-08-25 10:31:57 -06:00
HbmMods
6555d6316a
Merge pull request #2368 from RealSilverMoon/rbmki18n
i18n for RBMK DODD
2025-08-25 16:32:26 +02:00
Boblet
bf0aa7d285 changelog 2025-08-25 16:30:35 +02:00
HbmMods
fbc5177918
Merge pull request #2391 from Creeper-banner/bob
Update Simplified Chinese Localization
2025-08-25 16:30:00 +02:00
CrpBnrz
4aafbdaeac Merge remote-tracking branch 'origin/temp' into bob
# Conflicts:
#	src/main/resources/assets/hbm/manual/material/alloy.json
#	src/main/resources/assets/hbm/manual/material/aluminium.json
#	src/main/resources/assets/hbm/manual/material/arsenic.json
#	src/main/resources/assets/hbm/manual/material/arsenic_bronze.json
#	src/main/resources/assets/hbm/manual/material/bakelite.json
#	src/main/resources/assets/hbm/manual/material/bismuth.json
#	src/main/resources/assets/hbm/manual/material/bismuth_bronze.json
#	src/main/resources/assets/hbm/manual/material/bscco.json
#	src/main/resources/assets/hbm/manual/material/cadmium.json
#	src/main/resources/assets/hbm/manual/material/cadmium_steel.json
#	src/main/resources/assets/hbm/manual/material/cinnabar.json
#	src/main/resources/assets/hbm/manual/material/coke.json
#	src/main/resources/assets/hbm/manual/material/copper.json
#	src/main/resources/assets/hbm/manual/material/desh.json
#	src/main/resources/assets/hbm/manual/material/ferrouranium.json
#	src/main/resources/assets/hbm/manual/material/graphite.json
#	src/main/resources/assets/hbm/manual/material/gunmetal.json
#	src/main/resources/assets/hbm/manual/material/hss.json
#	src/main/resources/assets/hbm/manual/material/latex.json
#	src/main/resources/assets/hbm/manual/material/lead.json
#	src/main/resources/assets/hbm/manual/material/mingrade.json
#	src/main/resources/assets/hbm/manual/material/neptunium.json
#	src/main/resources/assets/hbm/manual/material/plutonium-238.json
#	src/main/resources/assets/hbm/manual/material/plutonium-239.json
#	src/main/resources/assets/hbm/manual/material/plutonium-240.json
#	src/main/resources/assets/hbm/manual/material/plutonium-241.json
#	src/main/resources/assets/hbm/manual/material/plutonium-rg.json
#	src/main/resources/assets/hbm/manual/material/plutonium.json
#	src/main/resources/assets/hbm/manual/material/polonium.json
#	src/main/resources/assets/hbm/manual/material/polymer.json
#	src/main/resources/assets/hbm/manual/material/radium.json
#	src/main/resources/assets/hbm/manual/material/rubber.json
#	src/main/resources/assets/hbm/manual/material/silicon.json
#	src/main/resources/assets/hbm/manual/material/sodium.json
#	src/main/resources/assets/hbm/manual/material/steel.json
#	src/main/resources/assets/hbm/manual/material/sulfur.json
#	src/main/resources/assets/hbm/manual/material/tantalium.json
#	src/main/resources/assets/hbm/manual/material/technetium.json
#	src/main/resources/assets/hbm/manual/material/technetium_steel.json
#	src/main/resources/assets/hbm/manual/material/thorium.json
#	src/main/resources/assets/hbm/manual/material/uranium-233.json
#	src/main/resources/assets/hbm/manual/material/uranium-235.json
#	src/main/resources/assets/hbm/manual/material/uranium-238.json
#	src/main/resources/assets/hbm/manual/material/uranium.json
#	src/main/resources/assets/hbm/manual/material/weaponsteel.json
2025-08-25 22:06:36 +08:00
RealSilverMoon
4e30ac8084 A little distinction 2025-08-25 21:02:01 +08:00
HbmMods
63d5d41d48
Merge pull request #2389 from R-Kaenbyou/new-branch-1
ME Storage bus compat for Arc Furnace
2025-08-25 10:04:54 +02:00
HbmMods
fdf73a4f06
Merge pull request #2386 from abel1502/abel-better-wings
Better murky wings
2025-08-25 09:17:18 +02:00
HbmMods
dafe4a535e
Merge pull request #2374 from arantirnecrolord/master
update uk_UA
2025-08-25 09:14:03 +02:00
HbmMods
96793ec599
Merge pull request #2371 from FOlkvangrField/Multilingual-Function-Repair
Fixed the multilingual feature failure error of the "QMAW" system
2025-08-25 09:13:41 +02:00
Boblet
951c00d79d some fixes, RBMK control rod copyable 2025-08-25 09:12:09 +02:00
Bufka2011
d5e923c263 Uhuh 2025-08-24 14:28:38 -06:00
Bufka2011
9d67211ddd Fixed a joke that has been a bad joke for centuries. 2025-08-24 14:27:48 -06:00
Bufka2011
4b28ee2227 I18n implementation for cloth 2025-08-24 12:51:25 -06:00
Bufka2011
78ea52cbab I18n implementation for ItemLemon.java 2025-08-24 12:37:14 -06:00
Bufka2011
7793f9fa24 More sorting 2025-08-24 11:09:03 -06:00
Bufka2011
1d18d832e7 Sorting 2025-08-24 11:02:13 -06:00
R-Kaenbyou
14f7668a9a
Update TileEntityMachineArcFurnaceLarge.java 2025-08-23 21:09:37 -07:00
R-Kaenbyou
f0bd84fa47
Update TileEntityMachineArcFurnaceLarge.java 2025-08-23 21:02:52 -07:00
R-Kaenbyou
13b3988829
Update ContainerMachineArcFurnaceLarge.java 2025-08-23 20:42:15 -07:00
R-Kaenbyou
0a99397f30
Add files via upload 2025-08-23 20:34:07 -07:00
R-Kaenbyou
52149b098e
Update AE2CompatHandler.java 2025-08-23 20:31:37 -07:00
R-Kaenbyou
4903b2e189
Update TileEntityMachineArcFurnaceLarge.java 2025-08-23 20:18:37 -07:00
Bufka2011
54a5769dee Minor changes 2025-08-23 20:10:04 -06:00
Bufka2011
f9369f5e02 Minor changes 2025-08-23 19:14:29 -06:00
Bufka2011
90522b98db Destroyed? 2025-08-23 18:52:10 -06:00
Bufka2011
9e83f24179 Blueprint Booklet 2025-08-23 18:49:57 -06:00
Bufka2011
9a0cadaf9d I18n implementation for guns 2025-08-23 18:10:46 -06:00
Bufka2011
3f641a843b I18n implementation for bomb parts 2025-08-23 17:51:47 -06:00
Bufka2011
60b9e1fb18 I18n implementation for missiles and sattelites 2025-08-23 17:51:01 -06:00
Bufka2011
fa6b4faeee I18n for machines implementation 2025-08-23 17:09:19 -06:00
Bufka2011
fb4bca3544
Add files via upload 2025-08-23 11:13:02 -06:00
abel1502
9e99a21969
Remove unused import 2025-08-23 19:36:45 +03:00
abel1502
0ac72afa97
Make murky wings support shift+space for hovering 2025-08-23 19:36:19 +03:00
abel1502
bdd56b6062
Remove murky wings forced slowfall 2025-08-23 19:36:16 +03:00
abel1502
16824452b0
Better fine control
Shift already introduces a slowdown, no need to account for that
2025-08-23 19:33:08 +03:00
abel1502
ee1ffc98ba
Make murky wings more controllable 2025-08-23 19:31:40 +03:00
CrpBnrz
4b52afd0e1 Merge remote-tracking branch 'origin/bob' into bob 2025-08-23 15:52:39 +08:00
CrpBnrz
aa045050a1 QMAW localization created by me 2025-08-23 15:42:04 +08:00
Creeper-banner
b7dc3fb600
Merge branch 'HbmMods:master' into bob 2025-08-23 15:40:25 +08:00
Boblet
8ea7cf4080 can't wait for people to complain about this one 2025-08-22 13:06:47 +02:00
arantirnecrolord
7505b72f7a
pipirupirupirupipi 2025-08-21 13:07:19 +03:00
arantirnecrolord
763a702ed7
xd 2025-08-20 23:55:03 +03:00
arantirnecrolord
a4e1cc139f
fuck yea 2025-08-20 23:40:27 +03:00
arantirnecrolord
ecc8151919
i am alive! 2025-08-20 23:39:07 +03:00
FOlkvangrField
b4b471e5c3 Fix 2025-08-20 21:46:59 +08:00
CrpBnrz
525169743c QMAW localization from Tokiko 2025-08-20 21:28:56 +08:00
RealSilverMoon
e1d66c93a1 i18n for RBMK DODD 2025-08-19 16:23:56 +08:00
CrpBnrz
037af08963 Fix formatted strings 2025-08-19 08:15:49 +08:00
CrpBnrz
1a13e68c67 Merge remote-tracking branch 'origin/bob' into bob 2025-08-19 08:06:42 +08:00
Boblet
a0451b46a5 the glunch 2025-08-18 16:35:50 +02:00
CrpBnrz
c86aa101ba Update zh_CN.lang 2025-08-18 22:07:50 +08:00
Bob
be03467f65 slunkus the great, lord of death 2025-08-17 23:09:50 +02:00
HbmMods
b01b88cb03
Merge pull request #2361 from Bufka2011/master
QMAW russian translation and ru_RU.lang update
2025-08-17 17:58:17 +02:00
HbmMods
b7da4e7bd1
Merge pull request #2363 from abel1502/abel-buzzsaw-fix
Fix buzzsaw not replanting wheat occasionally
2025-08-17 17:57:11 +02:00
Bob
bee95f9065 scrungus 2025-08-17 17:55:28 +02:00
abel1502
d669c4372e
Fix buzzsaw not replanting wheat occasionally 2025-08-17 12:03:45 +03:00
Bufka2011
2db923173a
Update uranium.json 2025-08-15 13:11:05 -06:00
Bufka2011
9e2f116a32
Update uranium-235.json 2025-08-15 13:10:48 -06:00
Bufka2011
eaadc36618
Update steel.json 2025-08-15 13:10:29 -06:00
Bufka2011
8ef85c4d04
Update latex.json 2025-08-15 13:10:12 -06:00
Bufka2011
ffd83ebef3
Update graphite.json 2025-08-15 13:09:55 -06:00
Bufka2011
85895f7ce8
Update coke.json 2025-08-15 13:09:37 -06:00
Bufka2011
792dff062e
Update cadmium.json 2025-08-15 13:09:10 -06:00
Bufka2011
ed67caa19c
Update arsenic.json 2025-08-15 13:08:48 -06:00
Bufka2011
74bd23d76e
Update uranium-233.json 2025-08-15 13:07:16 -06:00
Bufka2011
9a47ec30f4
Update sulfur.json 2025-08-15 13:03:46 -06:00
Bufka2011
9b7332a047
Update radium.json 2025-08-15 13:00:32 -06:00
Bufka2011
098ecd3791
Update plutonium-rg.json 2025-08-15 12:59:44 -06:00
Bufka2011
de4a359002
Update plutonium-241.json 2025-08-15 12:59:18 -06:00
Bufka2011
997ed75b79
Update plutonium-239.json 2025-08-15 12:58:42 -06:00
Bufka2011
2ad1c2121d
Update neptunium.json 2025-08-15 12:58:10 -06:00
Bufka2011
9da95bbff3
Update mingrade.json 2025-08-15 12:57:05 -06:00
Bufka2011
c99f647e15
Update desh.json 2025-08-15 12:55:42 -06:00
Bufka2011
9ff54c2495
Update coke.json 2025-08-15 12:49:51 -06:00
Bufka2011
9b412c726d
Update cinnabar.json 2025-08-15 12:48:35 -06:00
Bufka2011
470f950b1a
Update aluminium.json 2025-08-15 12:46:08 -06:00
Bufka2011
4750b0eba2
Update aluminium.json 2025-08-15 12:45:41 -06:00
Bufka2011
458ee0a90e
Update weaponsteel.json 2025-08-15 12:42:02 -06:00
Bufka2011
563defd5f1
Update uranium.json 2025-08-15 12:41:27 -06:00
Bufka2011
2546cf79b7
Update uranium-238.json 2025-08-15 12:40:41 -06:00
Bufka2011
b8fa2a67d7
Update uranium-235.json 2025-08-15 12:40:04 -06:00
Bufka2011
4c162e9f37
Update uranium-233.json 2025-08-15 12:39:07 -06:00
Bufka2011
a4b49633c6
Update thorium.json 2025-08-15 12:38:13 -06:00
Bufka2011
00980d937a
Update technetium_steel.json 2025-08-15 12:37:24 -06:00
Bufka2011
c39854dbb4
Update technetium.json 2025-08-15 12:36:49 -06:00
Bufka2011
aa5c85ade5
Update tantalium.json 2025-08-15 12:36:10 -06:00
Bufka2011
cdda91f2d8
Update sulfur.json 2025-08-15 12:35:44 -06:00
Bufka2011
84c69e7803
Update steel.json 2025-08-15 12:35:04 -06:00
Bufka2011
1709848209
Update sodium.json 2025-08-15 12:34:22 -06:00
Bufka2011
f6ce5b5ae7
Update silicon.json 2025-08-15 12:33:30 -06:00
Bufka2011
bbe87c34c3
Update rubber.json 2025-08-15 12:31:34 -06:00
Bufka2011
37cee61269
Update radium.json 2025-08-15 12:30:23 -06:00
Bufka2011
81f9915e54
Update polymer.json 2025-08-15 12:28:38 -06:00
Bufka2011
8c696a6f64
Update polonium.json 2025-08-15 12:28:11 -06:00
Bufka2011
61ab6dda7b
Update plutonium.json 2025-08-15 12:27:31 -06:00
Bufka2011
96976e9fb4
Update plutonium-rg.json 2025-08-15 12:26:51 -06:00
Bufka2011
2bd11fdd71
Update plutonium-241.json 2025-08-15 12:25:58 -06:00
Bufka2011
07a6b144c8
Update plutonium-240.json 2025-08-15 12:25:18 -06:00
Bufka2011
d8a6272597
Update plutonium-239.json 2025-08-15 12:24:51 -06:00
Bufka2011
0911ddc423
Update plutonium-238.json 2025-08-15 12:24:01 -06:00
Bufka2011
8e102c3fc8
Update neptunium.json 2025-08-15 12:21:07 -06:00
Bufka2011
aaff825539
Update mingrade.json 2025-08-15 12:20:22 -06:00
Bufka2011
0748abae07
Update lead.json 2025-08-15 12:18:39 -06:00
Bufka2011
1051342526
Update latex.json 2025-08-15 12:18:22 -06:00
Bufka2011
adc57e79b4
Update hss.json 2025-08-15 12:17:24 -06:00
Bufka2011
7741330fec
Update gunmetal.json 2025-08-15 12:16:48 -06:00
Bufka2011
74b0e4e929
Update graphite.json 2025-08-15 12:16:14 -06:00
Bufka2011
a88b7ef5df
Update ferrouranium.json 2025-08-15 12:15:33 -06:00
Bufka2011
f003235381
Update desh.json 2025-08-15 12:14:15 -06:00
Bufka2011
0920358df4
Update copper.json 2025-08-15 12:12:16 -06:00
Bufka2011
75dd1ea555
Update coke.json 2025-08-15 12:10:00 -06:00
Bufka2011
6def4eaac9
Update cinnabar.json 2025-08-15 11:56:58 -06:00
Bufka2011
c841002f70
Update cadmium_steel.json 2025-08-15 11:55:30 -06:00
Bufka2011
3ddad84863
Update cadmium.json 2025-08-15 11:51:11 -06:00
Bufka2011
907d97e1ba
Update bismuth_bronze.json 2025-08-15 11:50:01 -06:00
Bufka2011
af9780f57d
Update bismuth.json 2025-08-15 11:49:28 -06:00
Bufka2011
e6901d8134
Update bakelite.json 2025-08-15 11:47:36 -06:00
Bufka2011
5f041cde7d
Update arsenic_bronze.json 2025-08-15 11:46:50 -06:00
Bufka2011
4c67d4d0c3
Update bscco.json 2025-08-15 11:45:47 -06:00
Bufka2011
bdba1fc503
Update alloy.json 2025-08-15 11:44:20 -06:00
Bufka2011
ad6c7c06a5
Update aluminium.json 2025-08-15 11:40:54 -06:00
Bufka2011
8ddc169c31
Update arsenic.json 2025-08-15 11:38:35 -06:00
Bufka2011
9b316af586
Update alloy.json 2025-08-15 11:14:49 -06:00
Bufka2011
419b207eff
Merge branch 'HbmMods:master' into master 2025-08-15 11:11:19 -06:00
Bob
ba24ed64aa pink one detected 2025-08-15 17:59:39 +02:00
Boblet
9cfdc17115 multidimensional time crystal 2025-08-14 16:20:39 +02:00
Boblet
938c28f293 work, whore 2025-08-11 11:59:28 +02:00
Boblet
b374f4088b agony 2025-08-11 11:52:48 +02:00
Boblet
5444f57cad the glunch 2025-08-11 11:14:06 +02:00
Bufka2011
0ec1e5735a
rebar 2025-08-10 18:32:07 -06:00
Bob
219db7acdf blup 2025-08-10 22:02:23 +02:00
HbmMods
afab6c7750
Merge pull request #2348 from MellowArpeggiation/master
NBTStructureLib features & /ntmlocate command
2025-08-10 20:13:56 +02:00
HbmMods
8117f9b888
Merge pull request #2343 from legendarydoge30/oc-capacitor
opencomputer capacitor
2025-08-10 20:10:24 +02:00
HbmMods
b5363ef039
Merge pull request #2341 from PewPewCricket/master
add waste barrel and vitrified waste barrel recipes to assembly machine.
2025-08-10 20:09:36 +02:00
HbmMods
6f97e04dda
Merge pull request #2338 from Bufka2011/master
ru_RU update
2025-08-10 20:09:02 +02:00
HbmMods
f523b958d6
Merge pull request #2329 from NarekoMichigami810/master
zh_CN update
2025-08-10 20:08:35 +02:00
HbmMods
a9f2762a97
Merge pull request #2326 from 70000hp/the-gog-block
Update BlockWandLogic.java
2025-08-10 20:08:15 +02:00
Bob
242c4f5b03 drowned in the slop, forgotten in the slurry 2025-08-10 20:07:53 +02:00
George Paton
3f72a93d28 tandems! checking if all the affected chunks have generated yet has NOT yet been implemented tho 2025-08-08 18:44:29 +10:00
George Paton
7213b9b84d move jiggy map 2025-08-08 16:53:13 +10:00
道神 馴子
0c5c7a4150
bee 2025-08-08 14:37:24 +08:00
道神 馴子
10e21a2676
Merge branch 'HbmMods:master' into master 2025-08-08 14:29:51 +08:00
George Paton
3877a666a6
Merge branch 'master' into master 2025-08-08 14:55:30 +10:00
George Paton
84601f685f NBTStructureLib features brought back to NTM, including:
* `/locate` command
* custom spawning rules (eg. make something always spawn at 0,0)
* code structure reorg
* extra logging for misconfigured structures
2025-08-08 14:51:45 +10:00
Bob
a7c1a42244 scat 2025-08-07 20:23:28 +02:00
Bob
e8b7504fff and that's QMAW 2025-08-07 17:45:16 +02:00
道神 馴子
e450bbc49d
only thing i love 2025-08-07 17:17:27 +08:00
道神 馴子
26f1b38df9
Merge branch 'HbmMods:master' into master 2025-08-07 15:26:57 +08:00
Bob
d70464b3d1 QMAW the second (third?) 2025-08-06 20:13:44 +02:00
LegendaryDoge30
7bfb6ac7c6 open computer
open computers capacitor
2025-08-06 02:13:36 +02:00
PewPewCricket
96f02c6a16 add yellow waste barrel and vitrified waste barrel recipes to assembly machine. 2025-08-05 14:40:46 -05:00
Bufka2011
852e89b21d
typo fix 2025-08-05 12:30:32 -06:00
道神 馴子
b7ced0b946
Merge branch 'HbmMods:master' into master 2025-08-05 11:16:59 +08:00
Bufka2011
05630028a0
Merge branch 'HbmMods:master' into master 2025-08-04 20:11:22 -06:00
Bufka2011
30a20e34e0
Update ru_RU.lang 2025-08-04 20:11:12 -06:00
Bob
a5bdfa87d9 it just works 2025-08-04 20:16:50 +02:00
Bob
69b9ea9a7d consumed by the sludge 2025-08-04 19:18:41 +02:00
Bufka2011
889cc46486
Merge branch 'HbmMods:master' into master 2025-08-01 15:59:32 -06:00
道神 馴子
bafa8d6dba
Beyond the time 2025-08-01 13:46:45 +08:00
70000hp
5f999100d1 Update BlockWandLogic.java 2025-07-31 16:10:23 -04:00
Bob
737c56ed07 PUREX 2025-07-31 21:49:31 +02:00
Bufka2011
8d63e86a98
Merge branch 'HbmMods:master' into master 2025-07-31 09:24:12 -06:00
Bufka2011
ddc6e42f55
Update ru_RU.lang 2025-07-31 09:24:06 -06:00
Bufka2011
423cbbcf79
Update ru_RU.lang 2025-07-30 15:06:04 -06:00
Bufka2011
ef3397ddb1
Update ru_RU.lang 2025-07-30 14:55:18 -06:00
Bob
daae2a5e32 exponsiv 2025-07-30 22:40:28 +02:00
Bufka2011
5b22da19c4
Update ru_RU.lang 2025-07-30 13:49:47 -06:00
Bufka2011
e6c059041e
Update ru_RU.lang 2025-07-30 13:45:48 -06:00
Bufka2011
b9332f2e81
Update ru_RU.lang 2025-07-30 13:42:46 -06:00
Bufka2011
4d25b5dc8b
Update ru_RU.lang 2025-07-30 13:42:13 -06:00
Bufka2011
55bfe1b8d2
Update ru_RU.lang 2025-07-30 13:40:16 -06:00
Bufka2011
82b02c29ea
Update ru_RU.lang 2025-07-29 13:18:25 -06:00
Bufka2011
e85ae838c6
Update ru_RU.lang 2025-07-29 12:31:33 -06:00
Bufka2011
77df7e6cde
Update ru_RU.lang 2025-07-29 12:28:14 -06:00
Bufka2011
c82e371ec8
Update ru_RU.lang 2025-07-29 11:45:26 -06:00
Bufka2011
b656e1d22e
Update ru_RU.lang 2025-07-29 11:44:03 -06:00
Bufka2011
18855018c4
Update ru_RU.lang 2025-07-29 11:41:09 -06:00
Bob
7f887a623a 🅱️alls 2025-07-27 17:10:39 +02:00
HbmMods
66e0a0252b
Merge pull request #2311 from PewPewCricket/master
Fix flow control pump oc compat (i forgot to add one line in the last commit)
2025-07-25 17:51:38 +02:00
HbmMods
7b30d17031
Merge pull request #2302 from Nycticoraxnightheron/master
zh_CN update
2025-07-25 17:51:21 +02:00
Bob
131e4fd42d yesterday's shit buffet 2025-07-25 17:50:13 +02:00
PewPewCricket
7aa8818a5b Merge branch 'master' of github.com:PewPewCricket/Hbm-s-Nuclear-Tech-GIT 2025-07-24 13:34:00 -05:00
PewPewCricket
f0679b04cc fix FCP oc compat 2025-07-24 13:30:59 -05:00
Bob
2102db6229 RBMK autoloader 2025-07-24 15:12:54 +02:00
Justnightheron
a8485bdb5a
kris 2025-07-24 00:31:25 +08:00
Justnightheron
71695de235
Merge branch 'HbmMods:master' into master 2025-07-24 00:22:35 +08:00
Bob
fd04024706 cast yourself a whole house, cast yourself a new mother,
cast a vacation straight to fucking hell
2025-07-23 16:34:11 +02:00
Bob
2f74d17823 pouring out the conk 2025-07-22 23:17:59 +02:00
Justnightheron
9d558a68f3
😭 2025-07-22 18:42:21 +08:00
Bob
05bc334274 1v1 me on twitter vro 2025-07-21 00:52:02 +02:00
Bob
b7641dcd54 now's your chance to take a [BIG SHIT] 2025-07-18 23:34:43 +02:00
HbmMods
6bbb002e34
Merge pull request #2296 from arantirnecrolord/master
update uk_UA
2025-07-18 11:13:29 +02:00
arantirnecrolord
06930f6ec8
update uk_UA 2025-07-18 11:57:22 +03:00
HbmMods
2e6ca970a7
Merge pull request #2292 from WolfEclipses/master
Modified Radiolysis machine GUI
2025-07-18 08:09:16 +02:00
HbmMods
83876e388f
Merge pull request #2294 from abel1502/abel-fix-rbmk-console
Fix RBMK console rotation
2025-07-18 08:08:15 +02:00
HbmMods
85bef7672e
Merge pull request #2295 from PewPewCricket/master
Add OpenComputers compat for fluid pump and fix CCGT allowing throttle over max when using OpenComputers callbacks
2025-07-18 08:06:53 +02:00
PewPewCricket
8686a64141 fix CCGT allowing throttle over max when using OpenComputers callbacks 2025-07-17 14:46:57 -05:00
PewPewCricket
5fb88801ec add oc compat for fluid pump 2025-07-17 14:04:52 -05:00
abel1502
0c5077b54a
Don't forget OpenComputers 2025-07-17 21:40:57 +03:00
abel1502
23487bd0d8
Fix RBMK console rotation 2025-07-17 21:26:05 +03:00
Wolf
faa87edd40 Modified Radiolysis machine GUI to show rtg pellet location, tried to match with rtg style. I can also update to new gui style used in recent commits, but decided this was a start. 2025-07-17 11:20:15 -04:00
HbmMods
cc9d04d063
Merge pull request #2291 from Nycticoraxnightheron/master
zh_CN update
2025-07-17 07:57:04 +02:00
HbmMods
5b6f8e5b3d
Merge pull request #2290 from wiesenmann/paintable-pneumatic-tubes
Add a Full Block Paintable Pneumatic Tube
2025-07-17 07:56:40 +02:00
HbmMods
563b726b62
Merge branch 'master' into paintable-pneumatic-tubes 2025-07-17 07:56:31 +02:00
HbmMods
d389a2cf84
Merge pull request #2285 from PewPewCricket/master
Add Paintable Network Cable
2025-07-17 07:54:12 +02:00
Bob
9cf7cc6643 bluh 2025-07-16 21:59:48 +02:00
Justnightheron
6bbb354a9f
Rape that wall 2025-07-16 19:46:37 +08:00
wiesenmann
af6f3d76fe german localization fix 2025-07-16 13:08:48 +02:00
wiesenmann
97556e4c5a add paintable pneumatic tube 2025-07-16 11:56:10 +02:00
PewPewCricket
8bdf209c0b Merge branch 'master' of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT 2025-07-15 16:46:12 -05:00
Bob
f94fd70cf0 falling in love with a corporate illustration 2025-07-15 21:42:05 +02:00
Boblet
281e66b37e my love is a quickscope 2025-07-15 16:00:43 +02:00
PewPewCricket
73c2f9aa67 Merge branch 'master' of github.com:PewPewCricket/Hbm-s-Nuclear-Tech-GIT 2025-07-15 04:12:58 -05:00
PewPewCricket
fa6d8c1a54 Merge branch 'master' of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT 2025-07-15 04:11:47 -05:00
PewPewCricket
e18cc2d729
Merge branch 'HbmMods:master' into master 2025-07-15 04:10:38 -05:00
PewPewCricket
5f8b0f6aed fix TileEntityOpenComputersCablePaintable not implementing ICopyable and add null check for ModBlocks.oc_cable_paintable in CraftingManager.java 2025-07-15 04:10:06 -05:00
HbmMods
83b3ce085e
Merge pull request #2279 from abel1502/abel-door-hitboxes
Fix door hitboxes
2025-07-15 08:32:50 +02:00
HbmMods
6374f912cb
Merge pull request #2282 from abel1502/abel-electrolyzer-persist-gui
Persist electrolyzer GUI
2025-07-15 08:31:42 +02:00
HbmMods
cf94df9e48
Merge pull request #2284 from BallOfEnergy1/patch-1
Fix server crash due to client-side var being accessed on server
2025-07-15 08:30:47 +02:00
HbmMods
9ab3bc865b
Merge pull request #2286 from Pvndols/master
CCGT V3
2025-07-15 08:26:46 +02:00
PewPewCricket
76368acbf8 remove unused imports in BlockOpenComputersCablePaintable.java 2025-07-14 20:52:12 -05:00
PewPewCricket
da605a794e
Merge branch 'HbmMods:master' into master 2025-07-14 20:50:10 -05:00
PewPewCricket
02a4bf483e add dyable cable color functionality to paintable network cable 2025-07-14 20:31:54 -05:00
Boblet
12dbb340dd half-priced salammi 2025-07-14 16:42:54 +02:00
pvn
2cd25dbfb1
Merge branch 'HbmMods:master' into master 2025-07-14 12:41:43 +02:00
Bob
c83a53b62a ass embluh 2025-07-13 23:27:29 +02:00
Pvndols
982e50556b mauricio i can't move it move it anymore
AAAAAAAAAAAAAAAAAAAAA
2025-07-13 22:47:48 +02:00
Pvndols
dc04226713 fuck 2025-07-13 22:45:05 +02:00
Pvndols
fa6497146a hopefully i didn't fuck up
CCGT changes, automode now lowers throttle when fuel low, displays fuel consumption instead of a generic power setting in the GUI, small change in GUI description, the texture now includes what should be an air filter at the tubine intake. i am NOT good at texturing.
2025-07-13 22:43:02 +02:00
Pvndols
119b8a037b Revert "the spinniest of the fidgets"
This reverts commit 2841c8b67b8f459573142bbf33b1727f57159495.
2025-07-13 22:30:34 +02:00
Pvndols
e4f980e21c Merge remote-tracking branch 'origin/master' 2025-07-13 22:23:37 +02:00
PewPewCricket
da2abe281d add paintable network cable 2025-07-13 14:57:43 -05:00
Pvndols
2841c8b67b the spinniest of the fidgets
CCGT changes, automode now lowers throttle when fuel low, displays fuel consumption instead of a generic power setting in the GUI, small change in GUI description, the texture now includes what should be an air filter at the tubine intake. i am NOT good at texturing.
2025-07-13 21:05:28 +02:00
BallOfEnergy
fb32763c88
Update PistonInserter.java; Fix server crash due to client-side variable. 2025-07-13 11:45:17 -05:00
abel1502
4b6cf3473d
Save electrolyzer GUI 2025-07-13 13:19:43 +03:00
Boblet
10d8551ce3 all zinced up 2025-07-11 14:56:46 +02:00
abel1502
f2f3e04bb0
Fix gap in secure access door 2025-07-11 15:19:33 +03:00
abel1502
3c2d49419f
Use separate collision and visual boxes on doors
Also improve the user experience with smaller doors, by making the visual hitbox cover the entire door even when open. (In repsonse to Mellow's critique)
2025-07-11 15:09:17 +03:00
abel1502
16fcac0a3c
Support collision-only/visual-only boxes on doors 2025-07-11 15:09:00 +03:00
Boblet
89100738f4 holy cungadero do i feel good 2025-07-10 16:58:37 +02:00
HbmMods
ca3af9e863
Merge pull request #2270 from Toshayo/microblocks
Added Forge MicroBlocks support
2025-07-10 08:02:26 +02:00
HbmMods
ee99c1e491
Merge pull request #2269 from 70000hp/the-bob-mlock
The Logic Block
2025-07-10 07:55:33 +02:00
Toshayo
ef54c6e23b
Added Forge MicroBlocks support 2025-07-09 23:22:51 +02:00
70000hp
e7ebc7dd07 thunder fire all your generation 2025-07-09 13:10:47 -04:00
70000hp
c33b962043 misc fix 2025-07-09 13:07:33 -04:00
70000hp
603cc10696 Interactions for the logic block 2025-07-09 13:07:33 -04:00
70000hp
541c6a1c99 Interactions for the logic block 2025-07-09 13:07:33 -04:00
70000hp
21efc6b61c Interactions for the logic block 2025-07-09 13:07:33 -04:00
70000hp
3d77afab1f disguises for the logic block 2025-07-09 13:07:33 -04:00
70000hp
714a5298a9 disguises for the logic block 2025-07-09 13:07:33 -04:00
70000hp
acb01b13e0 copy tool support and working directional offsets 2025-07-09 13:07:33 -04:00
70000hp
274995ebd6 copy tool support and working directional offsets 2025-07-09 13:07:33 -04:00
70000hp
c42e03c268 the gob block 2025-07-09 13:07:33 -04:00
70000hp
453c47c6f0 the gob block 2025-07-09 13:07:33 -04:00
Boblet
9c818f45d1 scum construction machine 2025-07-09 16:56:42 +02:00
Boblet
dcdf5c4f27 Revert "Merge pull request #2261 from 70000hp/the-lob-block"
This reverts commit f24c244730c0ae9bf83437b5d2f0d062a5482e61, reversing
changes made to 0cf9d88e36f0a7209a840419ce1f3cbf277e3a9a.
2025-07-09 09:57:49 +02:00
HbmMods
0e92a96b2a
Merge pull request #2267 from abel1502/abel-rbmk-crane-span
RBMK crane improvement
2025-07-09 08:25:19 +02:00
HbmMods
8a3c8b5e10
Merge pull request #2268 from abel1502/abel-qe-sliding-door
Stop QE sliding door model clipping
2025-07-09 08:24:34 +02:00
HbmMods
f24c244730
Merge pull request #2261 from 70000hp/the-lob-block
Dungeon Action Block, and Mob Decorator improvments
2025-07-09 08:19:43 +02:00
abel1502
19fd479170
Fix stuff 2025-07-09 01:50:09 +03:00
abel1502
0e5e114b12
Stop QE sliding door model clipping 2025-07-09 01:27:04 +03:00
abel1502
d8080835f8
Detect room bounds when linking RBMK crane 2025-07-09 01:25:58 +03:00
abel1502
097b2bb12c
Fix RBMK crane girder rendering with unequal spans 2025-07-09 01:25:54 +03:00
abel1502
8294df1aa3
Extend RBMK crane reach forward
Enables close-to-real-life reactor hall replicas, with the storage columns being located further in the reactor hall than the reactor itself
2025-07-09 01:25:45 +03:00
Boblet
0cf9d88e36 needle punch fuck machine 2025-07-08 16:46:41 +02:00
Boblet
6b1d61166f rotten grussy 2025-07-07 16:56:23 +02:00
Bob
ba220420fe the sludge 2025-07-06 22:35:26 +02:00
Bob
79c7faf55b scatman's world 2025-07-05 23:43:55 +02:00
Boblet
0880287660 assembler module 2025-07-04 15:24:28 +02:00
70000hp
360b0acabe Interactions for the logic block 2025-07-04 09:21:13 -04:00
HbmMods
b3983f7fb8
Merge pull request #2259 from abel1502/abel-abilities-fix
Fix ItemToolAbility bedrock breaking
2025-07-04 09:36:28 +02:00
70000hp
edd952ec6a Interactions for the logic block 2025-07-03 15:09:16 -04:00
Boblet
6282bd028d ough 2025-07-03 15:01:24 +02:00
abel1502
ac45637bf6
Just a bit more null checks 2025-07-03 12:26:59 +03:00
abel1502
4983002013
Fix ItemToolAbility bedrock breaking 2025-07-03 12:22:33 +03:00
Boblet
3da96091da flixes 2025-07-02 16:50:20 +02:00
70000hp
8bef7d63dd disguises for the logic block 2025-07-01 20:11:39 -04:00
Boblet
c55c8c5da1 the moon is cheese that makes you trip balls 2025-07-01 15:57:56 +02:00
HbmMods
90813de8cc
Merge pull request #2251 from Nycticoraxnightheron/master
zh_CN update
2025-07-01 11:02:55 +02:00
Justnightheron
90ab38dc44
2025-07-01 16:58:23 +08:00
HbmMods
3592deca8e
Merge pull request #2250 from MellowArpeggiation/master
Nodespace performance improvements MkII
2025-07-01 10:03:23 +02:00
George Paton
58da6f154e move door to faster network serialization, remove now unused door sync packet 2025-07-01 17:46:33 +10:00
George Paton
25a2172c6b switch to LinkedHashMap for 23x performance improvement! 2025-07-01 17:44:52 +10:00
HbmMods
8685831c04
Merge pull request #2247 from abel1502/abel-trapdoors
Add a steel trapdoor
2025-07-01 08:34:04 +02:00
70000hp
1f7131536c Merge branch 'master' into the-lob-block 2025-06-30 16:07:33 -04:00
70000hp
1a9fc72a93 copy tool support and working directional offsets 2025-06-30 15:33:26 -04:00
Lazzzycatwastaken
43f38d8679 sdsa 2025-06-30 17:38:36 +02:00
Boblet
c08a90553a FLESH 2025-06-30 16:30:59 +02:00
abel1502
533dfd6ded
Fix localization 2025-06-30 16:08:38 +03:00
abel1502
ac7f186528
Oops 2025-06-30 16:04:01 +03:00
abel1502
17b0dde444
Remove all but the steel trapdoor 2025-06-30 16:02:38 +03:00
abel1502
1da6140e2e
Merge branch 'master' of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT into abel-trapdoors 2025-06-30 15:58:53 +03:00
HbmMods
cac082a6e2
Merge pull request #2246 from abel1502/abel-tangible-presses
Turn burner & electric press into proper pseudomultiblocks
2025-06-30 09:14:05 +02:00
abel1502
2e5882df60
Don't break the whole thing 2025-06-30 09:15:12 +03:00
abel1502
f792fdebe3
Make presses un-multiblockable with a hand drill
As per @MellowArpeggiation 's request. Meant for schenanigans with visually squishing things
2025-06-30 09:12:20 +03:00
HbmMods
4875aefba4
Merge pull request #2245 from abel1502/abel-buffer-extractor
Make conveyor extractors take items to inventory when not facing a conveyor
2025-06-30 08:01:18 +02:00
70000hp
3db1dbd277 the gob block 2025-06-29 19:11:39 -04:00
abel1502
18a310ba3a
Prevent pseudomultiblocks disappearing on chunk boundaries
If this was indeed a problem, it must've been one before my PR... I suspect maybe some of my intermediate implementations allowed this to have an effect. Regardless, this is definitely a useful fix
2025-06-30 00:25:33 +03:00
abel1502
d1497abd1e
Simplify press click handling
Turns out there is already a function for doing just that
2025-06-29 23:41:47 +03:00
Bob
3583ad66cd ough 2025-06-29 22:30:04 +02:00
abel1502
d1f50a8eb4
Fix press auto-migration 2025-06-29 15:45:52 +03:00
HbmMods
27c0c94897
Merge pull request #2241 from abel1502/abel-misc-tweaks-2
QoL tweaks 2
2025-06-29 10:31:48 +02:00
HbmMods
42d45506bd
Merge pull request #2244 from abel1502/abel-suspend-inserter
Allow stopping conveyor inserters with redstone
2025-06-29 10:23:24 +02:00
HbmMods
3658953d33
Merge pull request #2243 from Lazzzycatwastaken/zg
hotfix because github decided not to push the actual NBT file ???
2025-06-29 10:22:43 +02:00
abel1502
3b36807242
Trigger the press fix automatically 2025-06-29 02:01:25 +03:00
Bob
b89bec56c8 gun 2025-06-29 00:06:44 +02:00
abel1502
0eb87524ab
Make new press implementation savegame-compatible 2025-06-29 01:05:39 +03:00
abel1502
4a869ae2ea
Add automatic migration API to BlockDummyable 2025-06-29 01:05:10 +03:00
abel1502
41d62c49db
Remove broken & redundant transformMeta 2025-06-29 00:24:47 +03:00
abel1502
1bb88b176a
More fixes
Turns out, pseudomultiblocks are pretty complicated
2025-06-29 00:10:49 +03:00
abel1502
1f073d570c
Fix createNewTileEntity and clean up a bit 2025-06-28 23:53:38 +03:00
abel1502
f6f1c1c380
Turn presses into pseudomultiblocks
Affects burner and electrical press. They seem to have been implemented largely based on copy-pasted furnace code, and seemingly predate BlockDummyable. That meant the top two blocks of a press were intangible. Now they're in line with the rest of the machines, including the conveyor press.
2025-06-28 23:53:35 +03:00
abel1502
997e96f757
Exclude special slots 2025-06-28 23:23:39 +03:00
abel1502
db109d8bcf
Crane extractors take items to inventory when not facing a conveyor
Allows using them as an ad-hoc hopper with a small buffer. Previously their buffer was effectively rudimentary -- it was used for output, but nothing ever inputted into it.
2025-06-28 23:16:20 +03:00
abel1502
9a7124c8ff
Allow stopping conveyor inserters with redstone
A stopped inserted will still take items to its own inventory, but won't insert them into the inventory it is facing. Useful for taking out stuff from overflowing outputs, if you want to maintain a particular slot distribution.
2025-06-28 22:52:13 +03:00
abel1502
a3578e67a0
Revert "Make exhaustion only apply once"
This reverts commit 6946a70f18feb98b8297b3a68cd0c031c5dac284.
2025-06-28 22:41:11 +03:00
Lazzzycat
92bce167f3
Merge branch 'HbmMods:master' into zg 2025-06-28 21:01:25 +02:00
Lazzzycatwastaken
14377708be fuck you github 2025-06-28 21:00:53 +02:00
HbmMods
fa075a3bd4
Merge pull request #2239 from Lazzzycatwastaken/zg
fixing dickhouse glitched
2025-06-28 20:25:30 +02:00
HbmMods
62e32f70c6
Merge pull request #2226 from abel1502/abel-ae2-compat
Mass Storage AE2 compatibility
2025-06-28 19:25:45 +02:00
HbmMods
942f7fefea
Merge pull request #2235 from MerrittK/shredder_dust_fix
Shredder Preferential Ore registry.
2025-06-28 19:21:12 +02:00
HbmMods
c6fce12a0b
Merge pull request #2232 from 70000hp/port-tooltip-rfurnace
Rotary Furnace Port Tooltip
2025-06-28 19:19:35 +02:00
HbmMods
f4a1e8beed
Merge pull request #2228 from arantirnecrolord/master
uk_UA update
2025-06-28 19:16:44 +02:00
HbmMods
18a6f228c6
Merge pull request #2223 from Nycticoraxnightheron/master
zh_CN update
2025-06-28 19:16:15 +02:00
HbmMods
096cd046c5
Merge pull request #2221 from DangerousMilk/exhaust-block
Paintable Coated Variant Of The Exhaust Pipe.
2025-06-28 19:15:59 +02:00
Lazzzycat
a70410f5dd
Merge branch 'HbmMods:master' into Forwetst 2025-06-28 18:24:36 +02:00
Lazzzycat
f3ee962e8e
Merge branch 'HbmMods:master' into NTMRUINS1 2025-06-28 18:24:28 +02:00
Lazzzycat
bfe043b81d
Merge branch 'HbmMods:master' into Radio-house 2025-06-28 18:24:15 +02:00
Lazzzycat
f5db461bfd
Merge branch 'HbmMods:master' into forestchem 2025-06-28 18:23:45 +02:00
Lazzzycat
36080e183a
Merge branch 'HbmMods:master' into forestpost 2025-06-28 18:23:36 +02:00
abel1502
6946a70f18
Make exhaustion only apply once 2025-06-28 04:08:02 +03:00
abel1502
5a0dabc5a9
Bunch all mined blocks in one spot
Solves the problem of veinmined stuff being stuck in enclosed pockets, even with a magnet active
2025-06-28 04:07:42 +03:00
abel1502
71c1eaf430
Change flat AoE icon 2025-06-28 04:06:11 +03:00
abel1502
b400b88701
Add flat AoE ability 2025-06-28 04:06:03 +03:00
abel1502
f820ae32e2
Fix crate locked slot 2025-06-28 04:04:02 +03:00
abel1502
a40d0b3513
Make doors click-through when open
Currently clicking on anything beyond an open door just makes it close, despite there being no indications for that and the colliders clearly already not being there.
2025-06-28 04:03:41 +03:00
abel1502
0b5731266e
Hide spotlights on maps 2025-06-28 04:03:28 +03:00
abel1502
dec8c9c43a
Wow mojang is stupid
Or at least the mapping author is. How could I not get that `getBlocksMovement` should return if the block DOESN'T block movement, that's so obvious, why would I ever think otherwise
2025-06-28 04:03:12 +03:00
abel1502
466f12e6e2
Fix pathfinding on spotlights 2025-06-28 04:02:57 +03:00
Lazzzycatwastaken
32fc58821a sludge 2025-06-27 21:23:53 +02:00
Bob
03693e7c0a girl dinner (a bottle of whiskey) 2025-06-26 00:32:37 +02:00
MerrittK
57b0cc4727
Merge branch 'HbmMods:master' into shredder_dust_fix 2025-06-25 15:16:49 -04:00
MerrittK
89b145fde8 Merge branch 'shredder_dust_fix' of https://github.com/MerrittK/Hbm-s-Nuclear-Tech-GIT into shredder_dust_fix 2025-06-25 15:15:14 -04:00
MerrittK
a982616f89 I had to reinvent the wheel because of a different config implementation. 2025-06-25 15:12:00 -04:00
Boblet
2a7033bb76 lord of the lockerroom ft. big macintosh and his massive gun 2025-06-25 15:59:05 +02:00
70000hp
7737ac7989 Rotary Furnace Port Tooltip
Says what it does on the tin, hovering over the rotary furnace steam, fluid, and fuel ports, tells you what each one is for

Also gets rid of a vanilla obfuscation ID variable on a NTM class for strange reasons
2025-06-24 17:46:18 -04:00
MerrittK
46c59eace3
Merge branch 'HbmMods:master' into shredder_dust_fix 2025-06-24 10:41:40 -04:00
MerrittK
18d8fe292c Fixed Advanced rocketry moon turf compat 2025-06-24 10:40:21 -04:00
Boblet
f416b9ad44 born to shit (forced to wipe) 2025-06-24 15:58:10 +02:00
arantirnecrolord
1615096a84
i just don't know 2025-06-24 09:23:32 +03:00
Boblet
78c33e904d <agony> 2025-06-23 16:58:46 +02:00
Bob
3e3b651d11 i hereby name thee "sexy" 2025-06-22 16:11:06 +02:00
Justnightheron
25a7222cf2
Merge branch 'HbmMods:master' into master 2025-06-21 00:43:18 +08:00
Boblet
c2354adbc3 IFluidRegisterListener 2025-06-20 14:47:15 +02:00
arantirnecrolord
5a12d14948
fuck 2025-06-20 12:47:17 +03:00
arantirnecrolord
014a253e43
хімічний завод uk_UA 2025-06-20 12:09:26 +03:00
arantirnecrolord
dd5e4e1343
Merge branch 'HbmMods:master' into master 2025-06-20 12:07:55 +03:00
abel1502
149e79f550
Fix crash without AE2 2025-06-20 02:26:31 +03:00
abel1502
d15ab7079a
Reduce dependencies
If I understand it correctly, the implementation rule is there to include anything we use in the mod that is not part of the API? If so, I don't use anything like that. Anyway, it compiles, and it runs, so I'm happy with it. Revert this if issues arise, I guess
2025-06-20 02:00:49 +03:00
abel1502
2744ab322c
Fix annotations
Turns out the InterfaceList is obligatory, even if there's only one interface
2025-06-20 02:00:45 +03:00
abel1502
eaa2dfa23d
Add optional interface annotations 2025-06-20 01:42:38 +03:00
abel1502
9b08adc314
Mass Storage AE2 compat 2025-06-20 01:28:35 +03:00
Bob
381ef334b2 yet more chemfac crap 2025-06-19 21:27:56 +02:00
Boblet
570ad03802 who's been drawing dyx 2025-06-18 16:27:14 +02:00
Justnightheron
06a1b9163d
M78 2025-06-18 16:57:55 +08:00
DangerousMilk
ad4b1733d5 Fixed NBT data not saving. 2025-06-17 20:30:54 +02:00
Boblet
5aee91636c i stuck my ballsack in the coolant line & it got obliterated by delta P 2025-06-17 16:30:00 +02:00
DangerousMilk
474148110d Added the TileEntity to the TileMappings. Removed unnecessary canConnectTo function and TileEntityPipePaintable import 2025-06-17 14:23:45 +02:00
HbmMods
983f91edc5
Merge pull request #2215 from mlbv/master
mk5 performance improvement
2025-06-17 08:14:36 +02:00
DangerousMilk
155595772c Added recipe and changed function order to make more sense. 2025-06-16 17:48:05 +02:00
Boblet
5f08488268 d'oh 2025-06-16 16:17:31 +02:00
Bob
1e26546c79 chemfac chemfac 2025-06-15 22:40:59 +02:00
DangerousMilk
b328130edb Added paintable coated variant of the exhaust pipe. 2025-06-15 19:55:37 +02:00
mlbv
baad5cefbe feat: add RESOLUTION_FACTOR
Introduce RESOLUTION_FACTOR to scale ray density for tuning. Consider exposing this in BombConfig for runtime configuration.
2025-06-14 08:30:42 +08:00
abel1502
8ad065b891
Make bunker use a sturdy trapdoor 2025-06-13 21:19:46 +03:00
Boblet
3303df8345 ough 2025-06-13 14:47:50 +02:00
mlbv
7dab92f3b2 Perf: better caching 2025-06-13 12:39:27 +08:00
mlbv
d65cc18dd8 perf: pre-size maps to avoid overhead 2025-06-13 05:19:40 +08:00
abel1502
d4d552b9dd
Fix bounding box 2025-06-12 22:43:46 +03:00
abel1502
11fc058690
Fix trapdoor operation 2025-06-12 22:18:58 +03:00
abel1502
ae593a8188
Add metal trapdoors
By analogy with metal ladders. Felt weird to cap one off with a wooden hatch. Also, the mod's trapdoors are climbable if placed above a ladder.
2025-06-12 22:08:00 +03:00
Boblet
590da72fbb whatever, go my jerma 2025-06-12 16:11:02 +02:00
mlbv
a9567d986b refactor 2025-06-12 16:48:37 +08:00
HbmMods
f4af494d2a
Merge pull request #2207 from abel1502/abel-hotfix-2025-06
Hotfix my big PR again
2025-06-11 22:32:04 +02:00
abel1502
9c3e6e2ce4
Me stupid 2025-06-11 19:55:08 +03:00
HbmMods
959570c230
Merge pull request #2204 from mlbv/master
Fix chunkloading
2025-06-11 11:33:03 +02:00
mlbv
105f44a36a description update 2025-06-11 17:26:45 +08:00
mlbv
79dcb69ed2 some refactor 2025-06-11 10:18:21 +08:00
Bob
f2991e4518 dagoth ur yaoi 2025-06-10 22:59:04 +02:00
arantirnecrolord
37546b252d
🅰️ss 2025-06-10 20:35:59 +03:00
Boblet
6bfca4e1fe 🅱️alls 2025-06-10 15:32:47 +02:00
HbmMods
f03dca7470
Merge pull request #2202 from Nycticoraxnightheron/master
zh_CN update
2025-06-10 08:20:16 +02:00
HbmMods
cb8c95278c
Merge pull request #2201 from abel1502/abel-hotfix-2025-06
Hotfix my big PR
2025-06-10 08:19:44 +02:00
Justnightheron
9dbe596401
LENS 2025-06-10 14:04:20 +08:00
Bob
060c259fa9 bals 2025-06-09 22:49:23 +02:00
abel1502
57eba8e6ec
Fix scroll direction
Apparently, I forgot to cherry-pick the commit where I'd inverted it
2025-06-09 23:45:41 +03:00
HbmMods
6f598278d6
Merge pull request #2196 from abel1502/abel-bobble
Add a bobblehead of myself
2025-06-09 15:34:49 +02:00
HbmMods
6b28649094
Merge pull request #2194 from abel1502/abel-misc-tweaks-2025-06
QoL changes in bulk
2025-06-09 15:34:13 +02:00
HbmMods
47eabb8b36
Merge pull request #2198 from arantirnecrolord/master
typo correction uk_UA
2025-06-09 15:23:36 +02:00
HbmMods
63bf3a1e7c
Merge pull request #2199 from bpotato198/master
PL localisation fix
2025-06-09 15:22:56 +02:00
abel1502
d185a5ea22
Turn down mass storage sfx volume 2025-06-08 00:24:58 +03:00
BakedPotato
947ba198cc
Update pl_PL.lang 2025-06-07 18:46:31 +02:00
BakedPotato
c8ad381418
PL localisation 2025-06-07 18:24:48 +02:00
abel1502
e9888a8634
More NBT consistency
Normalize empty NBT to null NBT. Fixes stackability for empty inventories, as usual.
2025-06-07 00:28:17 +03:00
Boblet
cf82ea3796 facing oblivion to become the lode star 2025-06-06 14:03:52 +02:00
arantirnecrolord
8a93b02c94
who cares what i called it 2025-06-06 14:07:02 +03:00
abel1502
51ad12d51a
Add a notification for fan mode toggle 2025-06-05 20:49:10 +03:00
abel1502
88713946dd
Allow cycling the fan force falloff with a handdrill 2025-06-05 20:46:18 +03:00
arantirnecrolord
3b2a4aee1e
typo correction uk_UA 2025-06-05 20:27:28 +03:00
abel1502
4d0ce8b6d9
Add update packet to crates 2025-06-05 19:51:38 +03:00
abel1502
d27bda1f74
Add proper markDirty calls to tile entities 2025-06-05 18:56:40 +03:00
abel1502
84d3722c04
Save customName to NBT 2025-06-05 18:49:02 +03:00
Boblet
60f05defe0 deltarune tomorrow 2025-06-05 15:38:29 +02:00
Boblet
25e20662e4 a little gift for future me 2025-06-04 16:11:38 +02:00
abel1502
c9110aaa33
NBT consistency for crates opened from inventory 2025-06-03 23:57:43 +03:00
abel1502
c19e867bfd
Don't consume oil when suspended 2025-06-03 20:31:41 +03:00
abel1502
df8d456a90
Allow suspending autosaw with a screwdriver
Localized, though I'm not sure if it really needs to be
2025-06-03 20:26:07 +03:00
abel1502
8c196f05ca
Save forseSkip to NBT
Not included in `serialize()` and `deserialize()` because it is server-side-only
2025-06-03 20:23:14 +03:00
abel1502
f8d827d6cd
Make autosaw respect walls
Previously the blade always phased through solid walls. Now, if colliding with one, it will retract forcibly. In case there are valid targets behind a wall, it will ignore them for the next 5 degrees of rotation
2025-06-03 19:03:46 +03:00
abel1502
79d510aefb
Increase base fan force 2025-06-03 16:35:05 +03:00
abel1502
3733a8bee9
Fan force falloff
Previously, with two fans facing into each other, either one of them would completely overpower the other, or they'd cancel each other out. Now the force is inversely proportional to the distance, so the items end up in the middle
2025-06-03 15:54:46 +03:00
abel1502
d9ef97f345
Add glow 2025-06-03 14:08:02 +03:00
abel1502
20eb02e816
Fix posture and inscription 2025-06-03 12:56:36 +03:00
abel1502
61acb3db45
I turned myself into a bobblehead 2025-06-03 12:46:21 +03:00
abel1502
8a7934d274
Fix custom name for crates opened from hand 2025-06-02 23:46:01 +03:00
abel1502
997fb20129
This time for sure 2025-06-02 23:35:25 +03:00
abel1502
5fe26d5647
Fix renaming hook again
Turns out, there's a bug in Forge and the stacks are misassigned for that particular event
2025-06-02 23:35:20 +03:00
abel1502
cf26eac2c9
Fix renaming hook 2025-06-02 23:35:16 +03:00
abel1502
8970878e6b
Add look overlay to named crates
I think this is better than signs for a crate-based stockpile. Only shows the name for now, but a contents summary might be included too.
2025-06-02 21:51:54 +03:00
abel1502
6fb0b647fd
Disable repair cost increment on rename
Effectively a backport of a 1.8 feature. Relevant because otherwise a renamed crate is nbt-incompatible with itself after being placed and broken
2025-06-02 21:35:14 +03:00
abel1502
4bc07d9cbf
Add missing check 2025-06-02 21:06:47 +03:00
abel1502
0f7c8b49f3
Fix crate NBT inconsistency in crates
Apparently, a mined crate used to differ from a freshly crafted one because the former didn't have any spiders in it. The latter? Neither.
2025-06-02 20:55:01 +03:00
abel1502
169f1666e7
Retain names for storage crates 2025-06-02 20:54:46 +03:00
abel1502
7ef016ccce
Make mass storage process output instantly
Same deal as previously, this bypasses the bottleneck of tile entity ticking and network latency. This change is less relevant than the previous one, because there shift-dragging or shift-double-clicking were possible with mods, while here it only really affects autoclickers. Still, it can't hurt
2025-06-02 20:16:05 +03:00
abel1502
a6740a35e9
Make mass storage process input instantly
This allows to shift-click an entire inventory-load into a mass storage. Previously this was bottlenecked by the network latency and the tile entity tickrate.

Taking stuff out is unaffected for now, I'll see what I can do
2025-06-02 20:16:00 +03:00
abel1502
4b3430f9b1
Scrollwheel support for template folder 2025-06-02 18:50:20 +03:00
abel1502
640b0ae341
Merge remote-tracking branch 'upstream/master' into abel-misc-tweaks-2025-06 2025-06-02 18:40:37 +03:00
abel1502
4ae675aebc
Fix autocrafter output slot
This is the only case I found where a SlotPattern was supposed to support a stack size different from 1, but if there's any more, just add a `, true` to the end of the corresponsing slot constructor
2025-06-02 18:33:04 +03:00
Boblet
0c9bea7091 the selection 2025-06-02 16:58:59 +02:00
abel1502
5d7fc996e5
Make autosaw replant crops
It doesn't seem too far-fetched to suggest the seeds that fall to the ground are replanted in a natural way.

I had to replace the old ray-tracing approach with a more straightforward iteration over all possibly affected blocks (under 400, most of them skipped). In terms of performance this seems on par with the original solution (the raytrace function alone did 200 iterations).
2025-06-02 14:32:30 +03:00
HbmMods
e9b809d9dc
Merge pull request #2192 from MellowArpeggiation/sync-recipes
fix interaction max distance issue with detailed hitboxes
2025-06-02 08:21:20 +02:00
HbmMods
015ff7e5c1
Merge pull request #2189 from mlbv/1.7.10
DDA cleanup
2025-06-02 08:20:47 +02:00
George Paton
5501380d15 fix interaction max distance preventing interacting with detailed BlockDummyable hitboxes 2025-06-02 10:15:39 +10:00
abel1502
4a931a4be1
Remove angry metal drop
Considerting it is no longer used anywhere (Eye of Harmony doesn't count since the AMS is long deprecated), it felt weird to still get it 10% of the time
2025-06-02 01:04:21 +03:00
abel1502
2d33e90f93
Allow climbing freestanding chains and vines using spacebar 2025-06-02 01:00:11 +03:00
abel1502
afa0418104
Make strand caster timeout refresh on pour
Previously, if a caster has been idle for a while, the first time something is poured into it, it would spew out a partial load almost immediately. The original intention behind the timeout was instead to make the strand caster perform incomplete operations if no new material has been poured for a while. This change makes the behaviour closer to intended. Most of the time, persistent use of the caster would consistently reach full fill, and incomplete fill will only be processed at the end.
2025-06-02 00:15:36 +03:00
abel1502
8d7664f728
Integrate stack size logic directly into SlotPattern 2025-06-02 00:15:30 +03:00
abel1502
d890443150
Make wooden scaffold climbable 2025-06-02 00:14:29 +03:00
Bob
169e9c0879 lost in the sauce 2025-06-01 17:10:57 +02:00
Bob
0a1822ff10 my balls are heavy 2025-06-01 16:45:19 +02:00
Bob
0be198d21f in a rush 2025-05-31 18:04:16 +02:00
mlbv
70cd3d4071 DDA cleanup 2025-05-31 04:08:15 +08:00
HbmMods
891d4d869d
Merge pull request #2188 from MellowArpeggiation/sync-recipes
Automatic custom recipe sync for servers
2025-05-30 11:30:19 +02:00
George Paton
e6b84bd6d3 fix guard on checkNBT 2025-05-30 09:54:39 +10:00
George Paton
87a1c01fe7 disable recipe sync by default, can be enabled by server operators 2025-05-30 09:53:46 +10:00
HbmMods
95f3bcb1f5
Merge pull request #2180 from abel1502/abel-geiger-redstone
Geiger counter comparator integration
2025-05-29 18:11:25 +02:00
HbmMods
282326d3c4
Merge pull request #2183 from arantirnecrolord/master
add ukrainian translation
2025-05-29 18:10:46 +02:00
HbmMods
0c0c9d02d7
Merge pull request #2185 from Kirby7871/master
New OC functions for radar, launch pad and turrets.
2025-05-29 18:10:31 +02:00
Bob
a57e538479 go go gadget: 5 cups of coffee 2025-05-29 18:09:00 +02:00
Kirby7871
4f975293a5
Update TileEntityTurretBaseNT.java
Fixed Comma typo
2025-05-29 02:37:27 +02:00
Kirby7871
d01f54d1ba
Update TileEntityMachineRadarNT.java
Fixed a comma typo
2025-05-29 02:36:36 +02:00
Kirby7871
3a8e0048a3
Update TileEntityMachineRadarNT.java
Added an OpenComputers function, getPos().
It retuns the position of this radar.
2025-05-29 02:12:39 +02:00
Kirby7871
65f1866e8c
Update TileEntityTurretBaseNT.java
Added an OpenComputers function, getPos().
It returns the (x,y,z) coordinates of the turret in question
2025-05-29 02:06:40 +02:00
Kirby7871
087be46083
Update TileEntityLaunchPadBase.java
Added another OC (OpenComputers) function, getPos().
It returns the position of the launch pad. (x,y,z)
2025-05-29 02:01:39 +02:00
Boblet
9ff55acccf destroy tickets when we aren't using them 2025-05-28 16:56:21 +02:00
arantirnecrolord
381febd64e
Update UA 2025-05-28 16:00:43 +03:00
arantirnecrolord
30be3d5fa7
Add files via upload 2025-05-28 15:45:28 +03:00
arantirnecrolord
60f64f33f2
add translation 2025-05-28 00:28:06 +03:00
Boblet
acbea88eca now we're thinking with portals 2025-05-26 16:21:59 +02:00
abel1502
ac46cdf1ad
Fix comparator output 2025-05-26 15:18:37 +03:00
abel1502
8f2a858f52
Geiger counter comparator output 2025-05-26 14:53:07 +03:00
HbmMods
b00e3b9efb
Merge pull request #2178 from abel1502/abel-fix-2177
Fix #2177
2025-05-26 11:30:36 +02:00
abel1502
00c73d63c0
Fix #2177
The original hotfix is no longer necessary, as all remaning calls to getFullName are fully client-side
2025-05-26 12:16:20 +03:00
Boblet
38c6b4691d drooling baby safeguard 2025-05-26 10:46:22 +02:00
Boblet
e347aa4346 it's like mopping up 5 gallons of vomit 2025-05-26 10:05:03 +02:00
George Paton
7d6289b228 fix dummy blocks with detailed hitboxes not using them for clicks (interaction/breaking) 2025-05-26 10:12:46 +10:00
Bob
ce99e65b0b the spoingus 2025-05-25 22:12:33 +02:00
HbmMods
73406b4dae
Merge pull request #2167 from mlbv/1.7.10
Parallelized ray explosion
2025-05-24 14:07:22 +02:00
mlbv
1a5fda1847 Feat: accumulatedDestruction 2025-05-24 09:00:15 +08:00
mlbv
9d3860df64 Fix: Make generateSphereRays run asynchronously 2025-05-23 21:47:03 +08:00
HbmMods
630654ded7
Merge pull request #2169 from Nycticoraxnightheron/master
zh_CN update
2025-05-23 13:41:16 +02:00
Boblet
148ba19721 deploy surface-to-yellow-one missile 2025-05-23 13:40:48 +02:00
mlbv
ea430afe71 Fix: Make crate look normal 2025-05-23 19:40:45 +08:00
Justnightheron
ed59ba69f3
AUV您吉祥 2025-05-23 16:45:24 +08:00
HbmMods
4fc41c631d
Merge pull request #2168 from abel1502/abel-strand-caster-fix
Strand caster fix
2025-05-23 08:12:46 +02:00
HbmMods
051938a3cd
Merge pull request #2165 from abel1502/abel-conv-ejector-fix
Fix interaction between conveyor ejector and conveyor splitter
2025-05-23 08:10:48 +02:00
George Paton
933ecded5d send recipe JSON to all clients connecting to a server (does nothing in singleplayer, can be disabled via config) 2025-05-23 13:16:08 +10:00
abel1502
41189e5f25
I fixed it so good it stopped working
But now it does again. I'm just silly like that sometimes
2025-05-23 01:42:12 +03:00
abel1502
d3e839a9bb
Don't modify the out stack
Just in case, IDK
2025-05-23 01:08:27 +03:00
abel1502
81ca498fa8
Fix strand caster 2: electric boogaloo
Like, only cast if there is anything to cast, duh
2025-05-23 00:57:21 +03:00
abel1502
93638c3889
Fix strand caster
Also refactor it in the process, for good measure
2025-05-23 00:40:45 +03:00
Bob
6a7dabbb1e the malicious gigglefish from the silly dimension 2025-05-22 21:45:18 +02:00
mlbv
9bb9a56452 Fix: setDead() now correctly calls cancel() 2025-05-23 01:47:29 +08:00
mlbv
bf2a4b776f feat: parallelized explosion calculation
and is configurable
2025-05-23 01:01:34 +08:00
abel1502
f3a88b6afb
Apply fix to buffered items 2025-05-22 19:15:58 +03:00
abel1502
953d120fc6
Fix direction 2025-05-22 19:06:24 +03:00
abel1502
3a6f890774
Fix dupe 2025-05-22 18:51:54 +03:00
abel1502
dc66e5ac04
Conveyor ejector & splitter compat
Previously, an ejector ejecting directly into a splitter bypassed the splitting
2025-05-22 18:51:46 +03:00
Boblet
d19894fa3d kasane's titos 2025-05-22 16:36:17 +02:00
HbmMods
a47aa63d21
Merge pull request #2162 from MellowArpeggiation/master
screwdriver adjustable conveyor splitters
2025-05-22 08:06:43 +02:00
George Paton
e5cfc9cf2b add screwdriver info 2025-05-22 12:56:22 +10:00
George Paton
5459920b9c ensure pre-existing splitters initialise ratios 2025-05-22 12:51:34 +10:00
George Paton
b4ae72513b screwdriver adjustable conveyor splitters 2025-05-22 12:28:40 +10:00
Boblet
716e429772 the rim flappe on a bongfish 2025-05-21 16:29:18 +02:00
HbmMods
411d73ff9b
Merge pull request #2152 from abel1502/abel-abilities
Tool abilities GUI
2025-05-21 13:39:14 +02:00
HbmMods
e628976969
Merge pull request #2153 from Toshayo/rbmk-console-view-rotation
Added rbmk console view rotation support
2025-05-21 13:38:01 +02:00
abel1502
527459b92c
Add some null safety
In my survival playthrough, I got a crash when
a tool with AOE broke mid-operation.
This should fix it
2025-05-21 00:57:20 +03:00
abel1502
df1ee57563
Merge remote-tracking branch 'upstream/master' into abel-abilities
@HbmMods please, every commit you make is a merge conflict
2025-05-20 22:02:53 +03:00
Bob
b48b536834 thank you doctor, no more nose blood 2025-05-20 20:01:36 +02:00
Boblet
ce8099d4aa the sloplands 2025-05-20 15:55:27 +02:00
HbmMods
f73fa37659
Merge pull request #2159 from Nycticoraxnightheron/master
zh_CN update
2025-05-20 09:48:33 +02:00
HbmMods
c7f570706d
Merge pull request #2158 from MellowArpeggiation/master
the five hundredth crate dupe fix
2025-05-20 09:48:25 +02:00
Justnightheron
a8829245f4
juice 2025-05-20 14:08:40 +08:00
George Paton
4baf5e7c67 don't open conveyor sorter GUI when placing conveyors 2025-05-20 14:26:14 +10:00
George Paton
4f8c102b68 All dupes fixed and _verified_ 2025-05-20 14:21:56 +10:00
abel1502
b55d66ecac
Merge branch 'master' into abel-abilities 2025-05-19 23:16:22 +03:00
Bob
5cf209e2c1 guh 2025-05-19 21:30:25 +02:00
HbmMods
c49bbab8c9
Merge pull request #2154 from 7pheonix/master
I'm not even sure how i managed to break that
2025-05-19 16:12:40 +02:00
Boblet
9085dc5f0c 🅱️alls 2025-05-19 16:12:10 +02:00
pheo
fa25d17a45 fixed shading and green lightning in the breeder
my tummy hurt
2025-05-18 22:16:59 +01:00
abel1502
3f106f01e2
Merge branch 'master' into abel-abilities 2025-05-18 22:56:20 +03:00
Bob
345fe2ef06 i have a headache 2025-05-18 21:37:41 +02:00
Bob
ef5059a9a6 playing DOOM on my gucci smart toilet 2025-05-18 21:24:19 +02:00
Toshayo
bbc27820f1
Added rbmk console view rotation support 2025-05-18 21:20:52 +02:00
abel1502
de8b888f3e
Fix credits
Still not sure what happened, but if it was supposed
to be an æ and not a replacement char,
I can just type it by hand
2025-05-18 21:27:58 +03:00
abel1502
2c48bcb782
Minor fix
I realized I forgot to tweak this when adding
the reset button
2025-05-18 20:44:14 +03:00
abel1502
afb0c67090
Silly 2025-05-18 20:23:22 +03:00
abel1502
b85e4d2835
Fix ability listing for ability-less tools
Also I realized I don't need a linked hash map
now that I sort everything manually.
2025-05-18 20:16:03 +03:00
abel1502
4728e3c6ba
Fix visual glitch with harvest abilities 2025-05-18 16:16:58 +03:00
abel1502
aadb2d5f2a
Actually, I can refactor this to stay more true to the original 2025-05-18 15:45:44 +03:00
abel1502
25015a4f7a
Third time's the charm 2025-05-18 15:45:04 +03:00
abel1502
7c135c4a33
This time for sure 2025-05-18 15:11:54 +03:00
abel1502
92b9ab2369
Fix original block not being affected by ability 2025-05-18 14:57:54 +03:00
abel1502
05562018fc
Limit max presets 2025-05-18 14:38:21 +03:00
abel1502
c475e4f3d3
Clean up after cherry-picking
I originally did it in my local clone of NTM-Space,
and the cherry-picking seemingly carried along
a couple of features from there by accident
2025-05-18 14:25:52 +03:00
abel1502
29e69b9c49
Pat myself on the back 2025-05-18 14:19:22 +03:00
abel1502
2497d628e5
Fix explosing incompatibility 2025-05-18 14:18:22 +03:00
abel1502
cc31edff44
Change item tooltip 2025-05-18 14:18:20 +03:00
abel1502
ce64270b2c
Sort abilities consistently 2025-05-18 14:18:16 +03:00
abel1502
e23cfab649
Make explosion incompatible with harvest abilities 2025-05-18 14:18:14 +03:00
abel1502
239454e23c
Fix stuff 2025-05-18 14:18:11 +03:00
abel1502
b79b499b21
Add backwards compatibility in tool NBT 2025-05-18 14:18:08 +03:00
abel1502
c190863785
Reimplement ItemToolAbility
I'll be very impressed if it works correctly right away. But, to my credit, it does compile
2025-05-18 14:18:04 +03:00
abel1502
634836c549
Switch weapon abilities to the new system 2025-05-18 14:11:33 +03:00
abel1502
f1184f8731
Add explicit "public" to interfaces 2025-05-18 14:11:09 +03:00
abel1502
e59f8b441d
Implement ability presets 2025-05-18 14:11:07 +03:00
abel1502
853b6576ad
Rewrite weapon abilities 2025-05-18 14:11:05 +03:00
abel1502
0f22e34069
Add tooltip to gui 2025-05-18 14:11:04 +03:00
abel1502
61917ddc2f
Refactor GUIScreenToolAbility to support tooltips 2025-05-18 14:11:02 +03:00
abel1502
bf1e14c08f
Rewrite tool area abilities 2025-05-18 14:10:59 +03:00
abel1502
2982dd1f58
Begin ability refactor, rewrite tool harvest abilities 2025-05-18 14:10:37 +03:00
abel1502
caf416a27d
Tool ability selector frontend 2025-05-18 14:07:57 +03:00
HbmMods
3e35f0ac47
Merge pull request #2150 from Nycticoraxnightheron/master
zh_CN update
2025-05-16 14:47:54 +02:00
Boblet
f7baf332cb even more flixes 2025-05-16 14:46:12 +02:00
Night Heron
d360ebe6cc
Add files via upload 2025-05-15 23:14:21 +08:00
Boblet
9f758c49bc dud crap 2025-05-15 16:01:15 +02:00
Boblet
a43986603b more INDEX crap 2025-05-14 11:51:30 +02:00
Boblet
4ce7e396be doing absolutely nothing again 2025-05-13 16:25:39 +02:00
HbmMods
0c9fc86c12
Merge pull request #2143 from ackbarscrowbars/master
Small Scaffold Tweaks
2025-05-13 13:25:50 +02:00
HbmMods
58f8ba8f8c
Merge pull request #2144 from WushiThe/new3
prototype remodel
2025-05-13 13:25:29 +02:00
HbmMods
5d9ef5ae67
Merge pull request #2148 from 7H40/patch-1
Update ru_RU.lang
2025-05-13 13:24:57 +02:00
Bob
74992ede71 bop 2025-05-12 23:29:59 +02:00
LegendaryDoge30
273590a96b bombbs
added solinium bomb and changed the rendering because it was fucked up
2025-05-12 13:30:12 +02:00
Lazzzycat
e21b14b979
Merge branch 'HbmMods:master' into Radio-house 2025-05-11 19:46:30 +02:00
Lazzzycat
149e51288f
Merge branch 'HbmMods:master' into NTMRUINS1 2025-05-11 19:46:17 +02:00
Lazzzycat
14746a76b3
Merge branch 'HbmMods:master' into Forwetst 2025-05-11 19:46:00 +02:00
Lazzzycat
b95e9b6e80
Merge branch 'HbmMods:master' into forestchem 2025-05-11 19:45:39 +02:00
Lazzzycat
59df04d608
Merge branch 'HbmMods:master' into forestpost 2025-05-11 19:45:31 +02:00
Lazzzycatwastaken
f69a1d8876 AAAAAAAAAAAAAAAAAAAAAA 2025-05-11 16:49:47 +02:00
Lazzzycatwastaken
b485558e13 ☢☢☢☢☢☢☢☢☢☢☢ 2025-05-11 16:17:29 +02:00
7H40
6696f3b736 Update ru_RU.lang 2025-05-11 16:49:42 +03:00
Lazzzycatwastaken
791b4c7687 Top 5 easiest people to scam:
1. You
2. You
3. You
4. You
5. You
2025-05-11 15:36:52 +02:00
7H40
db0dbafe75
Update ru_RU.lang
tj_TJ.lang  --> ru_RU.lang
2025-05-11 06:17:38 +03:00
LegendaryDoge30
be84b21867 prototype
nina
2025-05-10 17:39:07 +02:00
HbmMods
763b6ec020
Merge pull request #2139 from Toshayo/opencomputers-steam-fluid-id-fix
Better steam turbine OpenComputers integration
2025-05-10 16:43:23 +02:00
HbmMods
6b65c79704
Merge pull request #2140 from Nycticoraxnightheron/master
zh_CN update
2025-05-10 16:42:23 +02:00
HbmMods
1ffe752ef6
Merge pull request #2142 from WushiThe/new2
ibm computer remodel
2025-05-10 16:42:05 +02:00
Bob
a1402daec2 charge thrower animations 2025-05-10 16:40:39 +02:00
ackbarscrowbars
2c68f3a57c
Rusted Scaffold Texture
Thought I'd just throw this in with the others, while I'm at it.
2025-05-09 18:06:55 -05:00
ackbarscrowbars
19c481c6d7
Yellow Scaffold Less Bright
While technically usable, the brightness was always just a little too contrasting when I tried using the yellow scaffold in builds. Apparently I'm not the only one, so might as well.
2025-05-09 17:20:13 -05:00
ackbarscrowbars
5b1121e0e4
Small Tweak to Steel Scaffold Texture
It had a dot that made the tiling look weird.
2025-05-09 17:17:35 -05:00
ackbarscrowbars
14eac38f3e
Fixed Scaffold UV + Cleaned Up Model
It had a bunch of erroneous sharps and extra vertices.
2025-05-09 17:14:30 -05:00
LegendaryDoge30
f3a9c0f787 puter 2025-05-10 00:12:33 +02:00
Lazzzycatwastaken
1eecfbca85 whos getting the best head:
A. Alvin
B. Theodore
C. Simon
(Secret option) Me
2025-05-09 19:38:11 +02:00
Night Heron
805ee3a998
cumming 2025-05-09 23:30:40 +08:00
Toshayo
15fb0c1ad7
Improved steam turbine OpenComputers integration + documented 2025-05-09 16:35:36 +02:00
Toshayo
be2edd87d8
Fixed wrong tank type. getInfo returns input tank type and setType also works with input tank type 2025-05-09 16:18:41 +02:00
Toshayo
03c5466c0e
Fixed id mismatch in steam turbine OpenComputers integration 2025-05-09 16:18:41 +02:00
HbmMods
20b46c3884
Merge pull request #2137 from abel1502/abel-veinminer
Make veinminer follow diagonals
2025-05-09 14:54:58 +02:00
Boblet
17de40d7b2 kill all zebras 2025-05-09 14:52:10 +02:00
Bob
21088af66f i cast: delete everything in that general direction 2025-05-08 23:10:21 +02:00
Boblet
71998aca41 bobms 2025-05-08 16:58:05 +02:00
abel1502
0d141f56b1
Fix import 2025-05-08 15:09:31 +03:00
abel1502
7d1a164bf7
Make veinminer follow diagonals 2025-05-08 15:07:16 +03:00
Bob
ca9b9f7b6c why do they call it the oven when you of in the cold food out hot eat th 2025-05-07 22:40:56 +02:00
Boblet
d8d3263493 grungus 2025-05-07 16:49:00 +02:00
Lazzzycatwastaken
22aefff48d get to work on the mob spawners bugboy 2025-05-06 23:18:28 +02:00
Bob
58166fda33 comical amounts of explosives 2025-05-06 21:55:11 +02:00
Boblet
b508f2f534 trench warfare special 2025-05-06 16:42:11 +02:00
Bob
af8cc78ad5 go go gadget 15 kilos of high explosive 2025-05-05 22:44:21 +02:00
Boblet
d4a25205a7 what the fuck - is happening - in this world of pure imagination 2025-05-05 16:29:31 +02:00
Bob
82d3523ea1 i have achieved stability (ability to stab) 2025-05-04 22:55:00 +02:00
Bob
dbbe55a990 RTTY control 2025-05-03 17:54:31 +02:00
HbmMods
0ab4f215b1
Merge pull request #2126 from MellowArpeggiation/master
NBT Structure fixes
2025-05-02 14:38:28 +02:00
Boblet
01df6f20c2 "music neva stops, no" - hatsune miku 2025-05-02 11:40:07 +02:00
George Paton
11d4412b83 fix NBT structure rotations for pipes
guard against funky generation bugs
fix missing cherenkov radiation visuals
2025-05-02 11:31:26 +10:00
HbmMods
4b5d9664bf
Merge pull request #2125 from Nycticoraxnightheron/master
zh_CN update
2025-05-01 21:46:14 +02:00
Bob
3cd9fc7b7c INDEX reader 2025-05-01 21:45:46 +02:00
Night Heron
82d6c0a923
Inside the Cable Temple 2025-05-02 00:14:50 +08:00
Bob
0685f231fe post merge cleanup 2025-05-01 11:43:47 +02:00
HbmMods
13b862d14e
Merge pull request #2120 from 7pheonix/master
Tinted Vegetation
2025-05-01 11:42:30 +02:00
pheo
592d52270c Merge remote-tracking branch 'origin/master' into pheo-tinted-veg-test 2025-05-01 10:41:28 +01:00
pheo
395acea899 now you're thinking with OOP 2025-05-01 10:41:21 +01:00
pheo
6b6c9635a3
Merge branch 'master' into master 2025-05-01 10:15:52 +01:00
Bob
edc870dff1 the ammo belt is shaped like an infinity symbol 2025-05-01 10:46:36 +02:00
pheo
64d3cdcf78
Update changelog 2025-04-30 15:38:58 +01:00
pheo
0aeeda9113 Merge remote-tracking branch 'origin/master' into pheo-tinted-veg-test 2025-04-30 15:35:54 +01:00
pheo
f0db8853e6 Minor Cleanup 2025-04-30 15:35:34 +01:00
pheo
c2a2a99a80
Merge branch 'HbmMods:master' into master 2025-04-30 15:31:29 +01:00
Boblet
c636632dc3 flamethrower improvements, 12 gauge flechette fix 2025-04-30 16:18:37 +02:00
Boblet
4fd4aa819b crate dupe fix(?) 2025-04-30 12:43:36 +02:00
pheo
f74b5a337c
Merge branch 'HbmMods:master' into master 2025-04-29 22:01:48 +01:00
pheo
152de687f2 terrible hacks, part 2 2025-04-29 21:57:53 +01:00
Bob
e518ef48c9 good monring and good night 2025-04-29 21:46:10 +02:00
HbmMods
f7659acde1
Merge pull request #2113 from Lazzzycatwastaken/dsss
full set zombie balance
2025-04-29 08:00:14 +02:00
pheo
108b581df2 tinted vegetation 2025-04-28 23:05:59 +01:00
Boblet
30f41fe1b0 sat dock fix, AP&DU nerf 2025-04-28 16:46:52 +02:00
Bob
f42b4b3dd4 nothing some booze and some paracetamol and jacking off and killing myse
lf can't fix
2025-04-27 21:52:30 +02:00
Lazzzycatwastaken
f1ad376a5d dsads 2025-04-27 20:24:21 +02:00
Lazzzycatwastaken
29979ab319 Welcome to balancing academy! are you ready to begin learning?
Lazzzycat: *gulps*
alc: *shakes head*
Yes 7 they say in unison
2025-04-27 20:13:31 +02:00
Boblet
13741930ca more crap 2025-04-25 15:07:49 +02:00
HbmMods
c1d3aad937
Merge pull request #2106 from archiecarrot123/master
Reduce calls to System.currentTimeMillis
2025-04-25 10:10:34 +02:00
Archie Halliwell
f45cffd9ce copy muffintime's changes 2025-04-25 13:58:10 +10:00
Archie Halliwell
1fbb8fafb9 reduce calls to System.currentTimeMillis 2025-04-25 13:49:50 +10:00
Bob
96a7058f38 pew pew 2025-04-24 22:26:58 +02:00
Boblet
91e98a9013 some cleanup 2025-04-23 16:39:42 +02:00
Boblet
89f4da4ab4 pew pew 2025-04-22 16:28:53 +02:00
HbmMods
334cffe04e
Merge pull request #2099 from Lazzzycatwastaken/structur
fix for Ticking entity crash when spawning skeletors with guns
2025-04-22 08:21:28 +02:00
Lazzzycatwastaken
28d3664781 everybody gets a gun 2025-04-21 23:04:04 +02:00
HbmMods
312162734b
Merge pull request #2095 from Lazzzycatwastaken/structur
MORE ARMOR FOR ZOMBINE!!!
2025-04-21 17:39:57 +02:00
HbmMods
31dc235dc1
Merge pull request #2098 from Dash1269/ntmain-accelerator-tweaks
PA Dipole tweaks and particle serialisation
2025-04-21 17:37:53 +02:00
Bob
39c8a6711b 3 BIG SHOTS FROM [KITCHEN GUN] 2025-04-21 17:34:18 +02:00
Dosh
64b2525e04
serialise PASource particle to nbt 2025-04-21 23:57:07 +10:00
Dosh
e1dd8c80b4
ignore dipole coil penalties unless redirecting particle 2025-04-21 22:09:34 +10:00
Lazzzycatwastaken
03a6af791f what 2025-04-20 18:20:09 +02:00
Lazzzycatwastaken
0907997bec 1.1k elo boosted twisted - puppet mage gets mled to death by my 112 yo 430 hp deto katana. 2025-04-20 15:46:36 +02:00
Lazzzycatwastaken
1fa4dca870 Joe: YEAH, ARE YOU READY TEAM JOE?
Joe: We're gonna become the BEST detectives!
Quagmire: Giggity, let's do this!
Peter: All Right!
2025-04-20 14:48:05 +02:00
Dosh
2b37164ed6
automatic formatting 2025-04-20 18:20:13 +10:00
Bob
9ba8f797dc post merge cleanup 2025-04-19 17:59:14 +02:00
HbmMods
89377e9164
Merge pull request #2080 from WushiThe/new
geiger
2025-04-19 17:49:19 +02:00
HbmMods
cacf041cab
Merge pull request #2069 from Lazzzycatwastaken/conccoloredcrack
replacing sloppium structure
2025-04-19 17:47:59 +02:00
HbmMods
dc6faed2d9
Merge branch 'master' into conccoloredcrack 2025-04-19 17:47:07 +02:00
HbmMods
031c78b80e
Merge pull request #2084 from Lazzzycatwastaken/structur
Sloppelite structrute
2025-04-19 17:45:17 +02:00
HbmMods
0213916a42
Merge pull request #2088 from Darek505/Rotation-fixes
Fix armor arm offset
2025-04-19 17:44:08 +02:00
Bob
d9498cb2dc augh 2025-04-19 17:43:49 +02:00
Darek505
8221615898 Fix armor arm offset 2025-04-19 14:15:57 +03:00
Lazzzycatwastaken
0b0c5bc043 i forgot to change the loot amount so that it doesnt put 239013129 items into the crate 2025-04-18 19:48:47 +02:00
Lazzzycatwastaken
416ae78c6a PlaymakerJd struggles during Cuhlouts popcorn reading stream 2025-04-18 19:41:41 +02:00
Boblet
5372884c50 i spilled my tomato sauce 2025-04-18 14:40:18 +02:00
LegendaryDoge30
ef2fba2a52 geiger
counter
2025-04-18 13:59:39 +02:00
Boblet
78089b2265 yesterday's shit buffet 2025-04-18 07:49:30 +02:00
Bob
eeefb0e4eb trenchie: the return 2025-04-17 21:11:17 +02:00
Boblet
c6966aa7dc biome test 2025-04-16 16:49:47 +02:00
Boblet
1193b0f51f spring cleaning 2025-04-15 16:28:06 +02:00
HbmMods
1533a43e19
Merge pull request #2073 from MellowArpeggiation/master
Only delete connected conveyors, and only when crouching
2025-04-15 08:01:42 +02:00
George Paton
0338c6a8fd only delete connected conveyors, and only when crouching 2025-04-15 13:57:33 +10:00
Lazzzycatwastaken
7e81a7b5c2 github bent me over and fucked me in every hole now i need therapy 2025-04-14 22:13:14 +02:00
Boblet
6d67a31dff become one with the cicadas. aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 2025-04-14 16:49:36 +02:00
Lazzzycatwastaken
edc701e129 the devil couldnt reach me so he made me implement shitty code and then remove it and end up not implementing shit 2025-04-13 17:49:19 +02:00
Lazzzycatwastaken
fe52d7aed1 think of the lamest dude u know ... he listen to 2hollis don't he 2025-04-13 17:43:24 +02:00
Lazzzycatwastaken
0cc70760ab Imagine being an artic fox
You could run up on the opps in da snow
Id probably miss human things like fortnite and geek bars
But I'd prolly be tuff ngl
2025-04-13 17:39:58 +02:00
Bob
975b7ff722 mh 2025-04-13 15:59:50 +02:00
Lazzzycatwastaken
c6cd707894 you're not bricked up right now while you read this,
you have serious issue, you're on social media, bro, every 10 seconds you swipe,
you see the baddest girl on the planet, and you're sitting here soft,
oh lazy, but it would be weird if i was bricked while watching you talk,
how was that weird, is it weird to have high testosterone levels?
you need savor before it's too late bro, it might be your only shot.
2025-04-13 15:23:05 +02:00
Bob
3d0b8f0fec top 5 videos, starring top 5 videos 2025-04-13 14:27:27 +02:00
Lazzzycat
fb8e3b522f
Merge branch 'HbmMods:master' into zg 2025-04-13 05:02:35 -07:00
Bob
624bb35b72 sure, why not 2025-04-12 16:37:40 +02:00
HbmMods
d3e29bf5da
Merge pull request #2062 from Nycticoraxnightheron/master
Still an update for zh_CN
2025-04-11 20:05:30 +02:00
Night Heron
abc58c1dc2
Munburger is another mooncake 2025-04-12 01:47:30 +08:00
Night Heron
36c56501bd
Merge branch 'HbmMods:master' into master 2025-04-12 01:31:51 +08:00
Bob
1f6d4bf55b the part i forgot to push 2025-04-11 19:26:33 +02:00
Night Heron
985966d8a1
Merge branch 'HbmMods:master' into master 2025-04-12 01:24:25 +08:00
tuffpad
0c25ba0c1c im at tmobile currently and cant check whether this even fucking works so thats great 2025-04-11 15:28:56 +02:00
tuffpad
12c54d66e7 im at tmobile currently and cant check whether this even fucking works so thats great 2025-04-11 15:28:35 +02:00
Boblet
16f9c4ad16 more JSON tomfuckery 2025-04-11 13:17:56 +02:00
Night Heron
3be4d9a6bc
SALMIAKKI😋 2025-04-11 01:38:47 +08:00
Night Heron
0cb6d3530f
Merge branch 'HbmMods:master' into master 2025-04-11 01:24:41 +08:00
Boblet
345d6e8710 this machine can suck all day long 2025-04-10 16:41:31 +02:00
Bob
f5456e54b3 competitive hog cranking 2025-04-09 21:32:15 +02:00
Boblet
7b3e3284b3 it's like elonmusk hype tube except it's the exact opposite and it works 2025-04-09 16:54:37 +02:00
Boblet
98bc692d29 this is the last fucking refactor PR 2025-04-09 11:53:16 +02:00
Boblet
1282e525da bocci the cock 2025-04-08 16:37:39 +02:00
Boblet
4c501d209f we don't need a new action every 3 microseconds 2025-04-08 10:34:24 +02:00
Boblet
7a49ec2cae what are you doing in here? 2025-04-08 08:12:41 +02:00
Bob
955a349793 pfft 2025-04-07 23:09:09 +02:00
Boblet
fb19e4d93f everybody do the yoinky splinky 2025-04-07 16:53:08 +02:00
HbmMods
097907820b
Merge pull request #2052 from Lazzzycatwastaken/zg
Naval mine updat
2025-04-06 23:00:46 +02:00
HbmMods
e6bd1fef4a
Merge pull request #2048 from Lazzzycatwastaken/ttttt
RT gaynator new ui
2025-04-06 22:59:09 +02:00
Lazzzycatwastaken
5d3860a4f6 Texas just banned furries in schools. This was to make sure kids don't have fun. But you know what Texas won't ban? Being able to carry an AR-15 wherever you go. I love America, because furry suit sales will now decline and instead kids will turn to using firearms. Do you know what this means? We're going to be needing more bullets, which means the copper trade is going to skyrocket. This means you as a Mesopotamian copper merchant could make a lot of profit. 2025-04-06 16:10:14 +02:00
Lazzzycatwastaken
574c4f1ca2 Top 5 people i'd scam out of all their money:
1. You
2. You
3. You
4. You
5. You
2025-04-05 23:47:16 +02:00
Night Heron
c2d33ba043
Delete zh_CN.lang 2025-04-06 04:49:50 +08:00
Lazzzycatwastaken
8c6f2150fd SAD-slime ahh dih 👌
PAD-P.Diddy ahh dih 💀
RAD-radioactive ahh dih ☢
DAD-Doofenshmirtz ahh dih 🎩
GAD-gurt ahh dih 🍦
VAD-veiny ahh dih 🍇
UAD-united arab emirates 🇦🇪
CAD-creative ahh dih 🧠
2025-04-05 19:02:44 +02:00
Lazzzycat
da9b0750f7
Merge branch 'HbmMods:master' into ttttt 2025-04-05 18:33:31 +02:00
Lazzzycatwastaken
2d5ddd049d SAD-slime ahh dih 👌
PAD-P.Diddy ahh dih 💀
RAD-radioactive ahh dih ☢
DAD-Doofenshmirtz ahh dih 🎩
GAD-gurt ahh dih 🍦
VAD-veiny ahh dih 🍇
UAD-united arab emirates 🇦🇪
CAD-creative ahh dih 🧠
2025-04-05 18:33:06 +02:00
HbmMods
61c22602a4
Merge pull request #2040 from Nycticoraxnightheron/master
zh_CN update
2025-04-05 11:51:06 +02:00
Boblet
e23636044a moderate amounts of tomfoolery 2025-04-04 15:04:00 +02:00
Bob
c8ebf180ab WHERE TUBE 2025-04-03 21:51:56 +02:00
Boblet
8ed0411a27 baby steps 2025-04-03 16:51:31 +02:00
Boblet
a0b593a93e yeah whatever 2025-04-02 17:01:50 +02:00
Night Heron
63a68cf9ea
Qinhuangdao 2025-04-02 21:16:03 +08:00
HbmMods
532e27bf0a
Merge pull request #2038 from ackbarscrowbars/ackbarscrowbars-blehg-1
Laser Pistol Model & Textures
2025-04-02 09:41:21 +02:00
HbmMods
4aa7d195c0
Merge pull request #2036 from EverMine/master
Models refactoring, bugfixes
2025-04-02 09:40:58 +02:00
Bob
b9047ac593 yeah so what 2025-04-01 22:32:49 +02:00
IOcmet
484ff585d1
I forgot to make it static 2025-04-01 20:37:23 +03:00
ackbarscrowbars
79cace83b3
Add files via upload 2025-04-01 12:05:07 -05:00
ackbarscrowbars
445da9b38e
Add files via upload 2025-04-01 12:00:34 -05:00
HbmMods
6aad688485
Merge pull request #2037 from WushiThe/fleijaa
Fleija remodel
2025-04-01 16:57:41 +02:00
Boblet
e2b3b480c1 creekflow crashing its mercedes into a mcdonalds 2025-04-01 16:50:55 +02:00
LegendaryDoge30
85d29fc326 gone
i removed that
2025-04-01 13:00:10 +02:00
LegendaryDoge30
8d39fb7174 uhhh
why did they move around
2025-04-01 12:13:16 +02:00
LegendaryDoge30
9f86ef1980 fleija
fleija remodel
2025-04-01 12:09:31 +02:00
ItsMakar
bfede6d87b Refactor models, fix ModelArmorBase compatibility with SkinPort and Galacticraft 2025-04-01 13:06:57 +03:00
HbmMods
7fe7960dba
Merge pull request #2035 from Vaern/texture-test
added lightstone, variants, recipes, stairs, slabs
2025-03-31 22:22:21 +02:00
Vaern
c629b1e79b added lightstone, variants, recipes, stairs, slabs 2025-03-31 11:48:56 -07:00
HbmMods
df88ed481b
Merge pull request #2034 from WushiThe/naval-mine-test
smooth naval mine
2025-03-31 16:23:18 +02:00
Boblet
917ccb871c andrew tolvern is dead 2025-03-31 16:22:16 +02:00
LegendaryDoge30
f6d2ff3f5a smooth ball
made the shading on the naval mine smooth
2025-03-31 13:22:13 +02:00
HbmMods
26dcc1730d
Merge pull request #2033 from MellowArpeggiation/conveyor-upstream
Conveyor Mayhem
2025-03-31 11:31:47 +02:00
George Paton
f465758bfd whoops that was meant to be _client side_ 2025-03-31 18:27:25 +11:00
George Paton
4a0ac6e95f how the hell did this get indented like that 2025-03-31 18:20:13 +11:00
George Paton
e02142d255 new conveyor wand item that masquerades as a conveyor block, performing autoplacement! (from downstream spacefork) 2025-03-31 18:19:34 +11:00
HbmMods
54d2314496
Merge pull request #2031 from Lazzzycatwastaken/AAAAAAAAAAAAAAA
im mining my naval
2025-03-31 08:24:44 +02:00
HbmMods
c1e5ae5c30
Merge pull request #2032 from Millymilo00/master
Add OpenComputers support for the Coker
2025-03-31 08:03:22 +02:00
HbmMods
f43cf194cd
Merge pull request #2022 from BallOfEnergy1/Optimization
Toolbox Flixes!
2025-03-31 08:01:00 +02:00
Milo
32d3b6722f the commit 2025-03-30 19:54:23 -06:00
Bob
3323356c73 waser wifle 2025-03-30 23:08:05 +02:00
BallOfEnergy
12af0abed9 random fuckin fix
apparently this fixes all those `ntm_null` component issues
2025-03-30 14:51:20 -05:00
Lazzzycatwastaken
5c9f6962e2 -=*######*==
-########################=
                     =################################+
                  *######################################*
                ############################################
             -################################################=
            ####################################################
          ########################################################
         ############################*=############################
        ###########################...-..###########################+
      *###########################......##*#=########################+
     =#################################:....##########################+
     #####....=+....##.......+#.....##-..##..###.....####........######
    #######..-###..####.=#..*###...##..*####:..##...######..-####-######
   -########..###:..##*.##..*###...#...######...#...######..-###########+
   #########*..##...##.*##.........#...######...#...######......#########
   ##########..=..#..-.###..*###...#...######..:#...######..-############
  +###########...##...####..*###...##...####...##...###:##..-####.#######*
  #############.*###.:###....=#.....###.....:###........#........-########
  ########################################################################
  ############......###*......-##+...:##:..+####..#####....=...###########
  *##########*..######...####=..##-..####.:####....#####..####...#########
   ###########*...*###..######..+#-..####.:####.#..#####..####+..########+
   ##############...##..######..+#-..####.:###.***..####..####+..########
   *#########=####*..#..-####+..##+..####.+##-.###..-###..####..:########
    #########*......###*..##..-####.......##:..###....#....-...##=-#####
    =####################....-#.=######################################=
     *######################*:-########################################
      ###############-*###:-##.#++#+..:#.##.#.*#.##:##...#############
       ##############-*###..##.#++*:##+#.--.#.*#.-*:#.##=############
        *#############**#*##*##*####**##*##*####*#####**###########*
          ########################################################
           *#####################################################
             ##################################################
               ##############################################
                 =########################################=
                    +##################################*
                        +##########################+
                              ################
2025-03-30 19:44:48 +02:00
Lazzzycatwastaken
1ecbc015a3 le ponge die bob
new rust steel deco block (no more shittium recolor)
updated carrier to use it
naval mine model and texture swapped to legendarydoge30's
new effects for naval mine explosion (out of water and in water both have different effects)
crafting recipies added for all new things
dos uno
2025-03-30 19:00:30 +02:00
Lazzzycatwastaken
1b53215e61 i fucking forgot to remove this so ig 🌈 2025-03-30 00:42:02 +01:00
Lazzzycatwastaken
7e54c5478b Merge remote-tracking branch 'origin/AAAAAAAAAAAAAAA' into AAAAAAAAAAAAAAA 2025-03-30 00:36:18 +01:00
Lazzzycatwastaken
00f98ac456 Jamesh_2 Today at 22:03
Strapons work
ughhfhfd
2025-03-30 00:35:29 +01:00
BallOfEnergy
aaff6b9b70 Dupe fix!!! 2025-03-28 19:50:27 -05:00
BallOfEnergy
fa6d2a4e56 Fix rare crash related to toolboxing with a null NBT.
Fix toolboxes not popping when swapping hotbars, even when >6KB limit.
2025-03-28 18:31:31 -05:00
BallOfEnergy
b1a778c949 Merge remote-tracking branch 'upstream/master' into Optimization 2025-03-28 18:06:33 -05:00
Boblet
6ae779cb23 it's not rocket science 2025-03-28 14:34:31 +01:00
HbmMods
b1f4dfd984
Merge pull request #2021 from MellowArpeggiation/rbmk-crafting
Full RBMK crafting chains
2025-03-28 09:44:54 +01:00
HbmMods
77ca4e5c77
Merge pull request #2018 from Voxelstice/rbmk-console-xenon-bar
RBMK console fuel rod xenon bar
2025-03-28 09:43:41 +01:00
George Paton
fe2dddec3b bonus: fix cascading worldgen lag on depth deposits 2025-03-28 19:10:12 +11:00
BallOfEnergy
e9376c788c oh i kinda want this changed
one less warning lmao
2025-03-27 21:17:16 -05:00
BallOfEnergy
e79eae78a7 am I stupid?
Fix a few issues related to naming.
Fix toolboxes blocking all radiation.
Add toolbox tooltip.
Swap toolbox operations; clicking now swaps hotbars and shift-clicking opens the inventory for easier access (recommended by Mellow).
2025-03-27 21:16:29 -05:00
George Paton
2c4dc279b6 Merge branch 'master' into rbmk-crafting 2025-03-28 11:21:57 +11:00
Bob
f177c8899a i feel so shrigma 2025-03-27 22:12:19 +01:00
Voxelstice
9028ca87b0 Segmentation fault (core dumped)
makes the xenon bar on fuel rods work in the RBMK console
2025-03-27 18:43:21 +03:00
Boblet
f9f1e1c73e go go gadget: replace uterus with 30lb bowling ball 2025-03-27 16:02:35 +01:00
HbmMods
2d48960e2d
Merge pull request #2016 from WushiThe/contributing
1 single parenthesis
2025-03-27 08:28:33 +01:00
LegendaryDoge30
300f005de4 flux
added a single parenthesis to the thorium rbmk fuel flux function
2025-03-26 18:18:39 +01:00
Boblet
9943a73f2a groundbreaking changes 2025-03-26 16:53:07 +01:00
HbmMods
473bdd67c4
Merge pull request #2006 from Lazzzycatwastaken/AAAAAAAAAAAAAAA
Ocean structures
2025-03-26 09:37:27 +01:00
HbmMods
4e08e107a8
Merge pull request #2012 from MellowArpeggiation/master
More NBTStructure improvements from OUTER SPACE
2025-03-26 09:28:00 +01:00
HbmMods
088a640d8f
Merge pull request #2014 from Toshayo/master
Fixed crate item movement prevention applying to all held items
2025-03-26 09:25:16 +01:00
George Paton
86ce0f6509 if rod is hot, only show cooling recipe, if rod is cold, show only disassembly recipe 2025-03-26 11:50:35 +11:00
Toshayo
ca8a7a72f9
Fixed crate item movement prevention applying to all held items (let me move this coal powder) 2025-03-25 21:13:23 +01:00
Boblet
b90741f640 you've creeked your last flow, pardner 2025-03-25 15:48:29 +01:00
George Paton
a2f5eeada7 Add crafting recipes for RBMK fuel cooling, rod disassembly, and waste decaying 2025-03-25 16:42:00 +11:00
George Paton
20bd424cd4 fix rare crash when generating structures 2025-03-25 12:23:18 +11:00
George Paton
dfd5d2c2a6 They Came From OUTER SPACE 2025-03-25 10:29:21 +11:00
Lazzzycatwastaken
d625a9a9d9 Fixed doors on oil rig,
Fixed waterlogging on aircraft carrier
Balanced loot on aircraft carrier
Removed derrick from oil rig and made it a purely cosmetic build
removed asphalt from carrier because it made you 100x faster in water, and flung you across half the ocean.
2025-03-24 22:12:11 +01:00
Lazzzycat
375b4581e5
Merge branch 'HbmMods:master' into AAAAAAAAAAAAAAA 2025-03-24 20:53:31 +01:00
Lazzzycatwastaken
7731b4c1e8 Fixed boat deleting blocks under it or sum 2025-03-24 17:39:11 +01:00
Boblet
79d3b0cbb7 the infinite agony generator 2025-03-24 16:01:13 +01:00
Boblet
7146e20fb3 f u c k 2025-03-24 10:38:15 +01:00
HbmMods
659bd662bf
Merge pull request #2011 from MellowArpeggiation/master
fix switching barrel types not updating fluid net
2025-03-24 10:34:27 +01:00
George Paton
177e5a245e dingleberry blues 2025-03-24 20:00:01 +11:00
George Paton
b5d76afb8c fix switching barrel types not updating fluid net 2025-03-24 19:56:04 +11:00
HbmMods
4c58d9a084
Merge pull request #2005 from BallOfEnergy1/Optimization
Toolboxes!
2025-03-24 08:09:17 +01:00
HbmMods
5e9399a696
Merge pull request #2010 from MellowArpeggiation/master
Fix fluidnet bugs
2025-03-24 07:54:55 +01:00
George Paton
141e80bfcb batteries and fluid tanks now block propagation if not set to buffer mode (which the player can circumvent by cabling/piping around them, which gives them the choice of behaviour, and is more intuitive) 2025-03-24 16:09:56 +11:00
George Paton
62485c6854 fluid tank handling updated to match energy storage blocks, allowing for more consistent tank leveling behaviour 2025-03-24 15:05:56 +11:00
George Paton
f00f2c7ca3 fix compat shim incorrectly subscribing receiving tanks 2025-03-24 12:25:06 +11:00
George Paton
6db42e6d4b fix fluid valves not deactivating (was clearing power net rather than fluid net connections) 2025-03-24 11:49:53 +11:00
Bob
d6c15c8ff2 the malicious gigglefish from the silly dimension 2025-03-23 21:46:56 +01:00
Lazzzycatwastaken
6ceba52f95 Added beached patrol boat 2025-03-23 18:12:26 +01:00
Lazzzycatwastaken
9806d53b45 forgorred to commit ts 2025-03-23 16:25:36 +01:00
Lazzzycatwastaken
7d642f155c Fixed retardation code
Oilrig building upgraded and made it spawn always on the same Y
2025-03-23 16:17:16 +01:00
Lazzzycatwastaken
eb8971dc2e Added oil rig.
Made all structures rarer (via null spawn weight)
2025-03-23 13:27:38 +01:00
Lazzzycatwastaken
e318c83023 Yes i've planted the oil rig malware bob 👿 2025-03-23 00:47:32 +01:00
Bob
737fb1e432 go go gadget HIV 2025-03-22 23:29:02 +01:00
Lazzzycatwastaken
8bb91eda3c Oil Rig item pool 2025-03-22 21:33:25 +01:00
Lazzzycatwastaken
7ae8693841 Sunken Aircraft Carrier structure added. 2025-03-22 19:10:06 +01:00
BallOfEnergy
9839107c4e New GUI, also some index fixes. 2025-03-22 13:07:04 -05:00
BallOfEnergy
b139e084fb Merge remote-tracking branch 'upstream/master' into Optimization 2025-03-22 00:12:50 -05:00
BallOfEnergy
f27234879f BOO! surprise feature!
Completely revamped toolboxes, now they swap hotbars!
2025-03-22 00:12:32 -05:00
HbmMods
07618f6a60
Merge pull request #2002 from EverMine/master
Add missing adding to neiShredderRecipes in CompatRecipeRegistry
2025-03-21 19:23:31 +01:00
ItsMakar
cf5e0e7d12 No fucking way i did that mistake 2025-03-21 17:52:00 +02:00
ItsMakar
291a34103a Add missing adding to neiShredderRecipes in CompatRecipeRegistry 2025-03-21 16:42:49 +02:00
Boblet
3ac7a8cdd6 i cast: testicular contortion 2025-03-21 15:21:32 +01:00
HbmMods
fc716379c9
Merge pull request #2001 from Vaern/master
G3 Attachments
2025-03-21 07:55:42 +01:00
HbmMods
4ceadec5c6
Merge branch 'master' into master 2025-03-21 07:55:32 +01:00
HbmMods
ffa8a0c5bb
Merge pull request #1998 from BallOfEnergy1/Optimization
Crates, but backpacks!
2025-03-21 07:51:46 +01:00
Vaern
4ef77bad1f added g3 attachments, fixed g3 model, changed/fixed anims + orchestra 2025-03-20 22:17:32 -07:00
Bob
9f0fd19ef8 the good shit 2025-03-20 22:57:39 +01:00
Boblet
51b7c71534 good god, we gonna rock down to electric avenue 2025-03-20 15:42:37 +01:00
BallOfEnergy
725baf37ff Merge remote-tracking branch 'upstream/master' into Optimization 2025-03-19 22:01:34 -05:00
BallOfEnergy
8608796a09 ok i want this
listen ok im proud of them and i dont want them to fade
2025-03-19 20:44:39 -05:00
Bob
1538932316 guns are great, but why not make them better? 2025-03-19 22:13:42 +01:00
BallOfEnergy
c73ec3a0ac i fucked around, i found out
this shit WORKS
2025-03-19 13:31:56 -05:00
BallOfEnergy
0a59fa86a0 Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/api/hbm/fluid/IFluidConnector.java
#	src/main/java/api/hbm/fluid/IFluidUser.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityWatz.java
#	src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFluidTank.java
2025-03-19 13:28:38 -05:00
Boblet
5a9f3e75dc YOU KNOW HOW WE DO IT 2025-03-19 16:28:55 +01:00
Bob
ccc80781b2 ok that's it i've had enough 2025-03-18 21:20:57 +01:00
Boblet
7b80e9fb64 oh, in the distance i could see a pale light 2025-03-18 16:53:41 +01:00
Boblet
360daaa524 Merge branch 'master' of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT 2025-03-17 17:00:12 +01:00
Boblet
b5166ca517 augh 2025-03-17 17:00:07 +01:00
HbmMods
850679ca94
Merge pull request #1982 from KellenHurrey/master
Added a keybind for toggling the magnet armor modifications
2025-03-17 08:09:59 +01:00
HbmMods
11e9bc22ed
Merge pull request #1985 from Toshayo/master
Support for more unusual pylons
2025-03-17 08:09:03 +01:00
Bob
6d1165ba33 guh 2025-03-16 20:28:44 +01:00
KellenHurrey
a6f3cd54eb
Merge branch 'HbmMods:master' into master 2025-03-14 09:34:02 -07:00
Boblet
900f8e6959 flowing my creek so hard rn you wouldn't believe 2025-03-14 14:28:13 +01:00
KellenHurrey
86a805bd92
Merge branch 'HbmMods:master' into master 2025-03-13 21:39:31 -07:00
Toshayo
98f4b22a19
Upgraded base pylon code to support more unusual pylon types 2025-03-13 23:10:08 +01:00
Toshayo
5ead78349c
Updated TileEntityPylonBase and RenderPylonBase according .editorconfig 2025-03-13 23:08:19 +01:00
Boblet
3c2ddf4d64 *vomits* 2025-03-13 16:58:15 +01:00
KellenHurrey
f461851228 magnet keybinds 2025-03-12 12:30:08 -07:00
HbmMods
2bdbfda243
Merge pull request #1981 from KellenHurrey/master
There i fixed chunkloading drones
2025-03-12 09:07:22 +01:00
KellenHurrey
d1e4d1572f wholy shit i actually fixed chunkloading drones (and added a new util class) 2025-03-11 22:28:00 -07:00
Bob
20cb0f6f5d ba-dee-ya, say do u rember? ba-dee-ya, wen u feeled happy
ba-dee-ya, alway rember happy day!
2025-03-10 21:56:35 +01:00
Boblet
565d5c1129 go go gadget: detonate nutsack 2025-03-10 16:57:02 +01:00
Bob
0ca1be3d6f goober 2025-03-09 22:03:34 +01:00
BallOfEnergy
ac81021ddf small fix 2025-03-08 17:34:08 -06:00
BallOfEnergy
c6ca31eb23 what was i doing again?
seriously someone idk what i was doing
help
2025-03-08 17:26:12 -06:00
BallOfEnergy
52b781ea9f Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/api/hbm/energymk2/IEnergyReceiverMK2.java
#	src/main/java/com/hbm/items/weapon/ItemAmmoArty.java
#	src/main/java/com/hbm/items/weapon/sedna/factory/ConfettiUtil.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineRotaryFurnace.java
2025-03-07 22:06:13 -06:00
HbmMods
3da9f7c56f
Merge pull request #1973 from MellowArpeggiation/master
Fix comically long 9mm reload animation snapping
2025-03-07 08:05:23 +01:00
George Paton
df5253df1b
Merge branch 'HbmMods:master' into master 2025-03-07 16:50:40 +11:00
George Paton
1afe84a871 shit idiot brain fungus the sequel 2025-03-07 16:49:56 +11:00
Boblet
5d24e76601 compat for (hopefully) robust external recipe registering 2025-03-06 14:25:30 +01:00
Bob
a78dae4a8e alright i'm tired 2025-03-05 21:58:20 +01:00
HbmMods
23928d3d7b
Merge pull request #1970 from KellenHurrey/master
Make RBMK Rods actually be a SimpleComponent
2025-03-05 18:56:50 +01:00
Boblet
e21fe3eecc config crap 2025-03-05 16:57:50 +01:00
KellenHurrey
3bf526419e
Make RBMK Rods actually be a SimpleComponent 2025-03-04 17:23:43 -08:00
Boblet
ed4421b2e2 burned old textures, better sludge 2025-03-04 16:50:33 +01:00
HbmMods
5a9b65095d
Merge pull request #1965 from Toshayo/master
Redstone-over-Radio OpenComputers integration + Mining satellite NEI handler
2025-03-03 20:20:06 +01:00
Boblet
00cacbbadc damage fix, mas36 anim error, server config command 2025-03-03 16:05:28 +01:00
Toshayo
228fbf506d
Added satellite NEI handler 2025-03-03 11:20:40 +01:00
Toshayo
d13d0679b7
Added OpenComputers integration for redstone-over-radio receiver/transmitter 2025-03-03 11:20:40 +01:00
Bob
1238933bca yeag 2025-03-02 22:49:29 +01:00
HbmMods
3a5c943c0a
Merge pull request #1962 from MellowArpeggiation/master
fix vertibirds spawning unburied
2025-03-01 09:47:27 +01:00
George Paton
18d21a0f13 fix vertibirds spawning unburied 2025-03-01 10:40:44 +11:00
HbmMods
299f514f99
Merge pull request #1960 from 70000hp/windows-95
rotary furnace fuel thing
2025-02-28 08:31:19 +01:00
HbmMods
4c2639ecf4
Merge pull request #1961 from MellowArpeggiation/master
Performance boost for RBMKs (thanks DEKO)
2025-02-28 08:28:48 +01:00
George Paton
dc70967279 death by one million hashmap lookups (68ms -> 8ms over 60 seconds) 2025-02-28 11:56:03 +11:00
70000hp
1574f90a4d Merge branch 'master' into windows-95 2025-02-27 16:59:03 -05:00
Boblet
fb414ad80a yes we know your name now fuck off 2025-02-27 16:38:40 +01:00
HbmMods
3ae27afe4d
Merge pull request #1959 from Vaern/master
spent casings prrrrrr!!!
2025-02-27 10:30:24 +01:00
HbmMods
fa93b944b5
Merge pull request #1958 from MellowArpeggiation/master
Fix #1918 - RBMKs turning off when chunks unload, a world is quit, or a dimension unloads
2025-02-27 10:27:15 +01:00
Vaern
e6aa3f232d remove unused imports 2025-02-26 23:42:07 -08:00
Vaern
247f3eace8 finishing touches 2025-02-26 23:38:28 -08:00
Vaern
b789482f3d added initial rotvel to orchestras, flixes 2025-02-26 23:29:12 -08:00
George Paton
9da32595ff 4x rarer meteor dungeons 2025-02-26 19:36:47 +11:00
Vaern
b3e8fad079 added initial rotational momentums to casingCreator
remind me tomorrow to set the rest of the constants n add a lil randomess
2025-02-26 00:21:06 -08:00
George Paton
a6b1a9068b fix crash caused by placing piles immediately adjacent to RBMKs 2025-02-26 16:33:04 +11:00
George Paton
bb84ebe209 Fix #1918 - make sure node caching is per world, remove nodes from cache correctly, and prevent unloading dimensions immediately ceasing all reactivity. Also fixes rod information not updating unless the GUI is open 2025-02-26 15:38:31 +11:00
Vaern
ec311a6d54 removed unnecessary shit, fixed muzzle flash
prolly gonna figure out a systematic solution to customizing spent casing ejection/maxAge based on receiver
2025-02-25 19:46:02 -08:00
Boblet
fd500f8a98 and now for the boring part 2025-02-25 16:56:48 +01:00
Vaern
c5c6beb453 Finished casing physics
added initial momentums as a test
2025-02-24 23:47:48 -08:00
Vaern
747d0006b2 set casing models as vbos, will test later 2025-02-24 15:04:24 -08:00
Bob
06caf11654 yeah that's all the bugs that needed fixing 2025-02-24 21:43:44 +01:00
Boblet
bd3b52cd36 nodespace is dead, let's wear its skin 2025-02-24 14:45:23 +01:00
Vaern
61bba7974f added rotational momentum, better bounces to spent casings
turret's cases do not rotate for some reason!
2025-02-23 22:06:16 -08:00
Bob
0ccf81443a the malicious gigglefish from the silly dimension 2025-02-23 18:39:11 +01:00
Boblet
c3e532ab33 good god - we gonna rock down to electric avenue 2025-02-21 15:18:45 +01:00
Boblet
d20c190c3e the de-genericizing 2025-02-20 16:55:46 +01:00
HbmMods
e6e11a3a1c
Merge pull request #1949 from EverMine/locale_update
Locale updates
2025-02-20 08:35:11 +01:00
ItsMakar
223e0d2855 Fix some typos in en_US locale 2025-02-20 09:32:13 +02:00
ItsMakar
66feaf292f Merge branch 'locale_update' of https://github.com/EverMine/Hbm-s-Nuclear-Tech-GIT into locale_update 2025-02-20 09:31:25 +02:00
IOcmet
d802645bc3
Merge branch 'HbmMods:master' into locale_update 2025-02-20 09:31:08 +02:00
HbmMods
c855f67cda
Merge pull request #1948 from Dash1269/ntmain-rotaryfurnace-fix
Fix rotary furnace not saving output material
2025-02-20 08:22:09 +01:00
HbmMods
4fd9d5b0fa
Merge pull request #1947 from EverMine/rendering_fix
Replace manual matrix restoration in haze and radiation fog particle renderers to glPushMatrix and glPopMatrix
2025-02-20 08:21:37 +01:00
ItsMakar
f9e22ddab0 some localization for ru_RU ™️ 2025-02-20 09:20:51 +02:00
Dosh
b28cb312dc
fixed rotary furnace not saving output material 2025-02-20 16:39:19 +11:00
Dosh
c12948b330
automatic formatting 2025-02-20 16:37:50 +11:00
ItsMakar
a5fa13c32e Replace manual matrix restoration in haze and radiation fog particle renderers to glPushMatrix and glPopMatrix 2025-02-20 04:03:03 +02:00
IOcmet
093d23e700
Merge branch 'HbmMods:master' into locale_update 2025-02-20 00:59:29 +02:00
Boblet
4c82dfcdcb scraping out old crap 2025-02-19 16:37:17 +01:00
ItsMakar
d4f62675c4 Update ru_RU.lang 2025-02-19 07:43:13 +02:00
IOcmet
20646c407b
Merge branch 'HbmMods:master' into locale_update 2025-02-19 03:30:48 +02:00
Boblet
c3eb6035aa deplorable gollompus 2025-02-18 16:21:38 +01:00
HbmMods
23db8e3d86
Merge pull request #1943 from Vaern/idk
added mas-36 model, texture
2025-02-18 13:13:41 +01:00
Vaern
de8324ce9b added mas-36 model, texture 2025-02-17 10:14:54 -08:00
Boblet
18dfb21ca4 UNINOS 2025-02-17 16:59:17 +01:00
Bob
fd04bf9b3f a whole lot of nothing 2025-02-16 23:16:26 +01:00
HbmMods
4444038f35
Merge pull request #1937 from Creeper-banner/bob
Update zh_CN.lang for next release
2025-02-16 11:22:56 +01:00
IOcmet
beae7b31fe
Update ru_RU locale, rearrange it to en_US order and remove unused keys 2025-02-15 07:56:48 +02:00
Boblet
b1d5540887 my quest for beans has taken me to many places 2025-02-14 15:08:45 +01:00
Boblet
4aaf3ec864 new objective: kill ronald reagan 2025-02-13 16:45:38 +01:00
Creeper-banner
0262fcc984
Add files via upload 2025-02-12 17:11:58 +08:00
70000hp
3a7e974541 adjustments 2025-02-11 18:17:29 -05:00
70000hp
89fe899f2a Rotary Furnace Fuel Tweak
Better fuels speed up the rotary furnace, but require more steam
Steam requirements scale with speed nonlinearly, being x^1.5
2025-02-11 17:50:35 -05:00
Boblet
4972f4023a thorn glognuts for only 5 bintar 2025-02-11 16:46:14 +01:00
Boblet
614f5db7dc fuck! 2025-02-10 16:53:37 +01:00
HbmMods
d34624a224
Merge pull request #1935 from MellowArpeggiation/master
forgot the black book safe pool oops
2025-02-10 10:12:03 +01:00
George Paton
940f45813a forgot the black book safe pool oops 2025-02-10 20:07:59 +11:00
HbmMods
6043d1df80
Merge pull request #1934 from MellowArpeggiation/moige
NBT Structures + new Meteor Dungeon + bonus stuff
2025-02-10 08:57:53 +01:00
HbmMods
27afb9eb7b
Merge pull request #1930 from darkalit/master
Return OC integration with Energy storage block
2025-02-10 08:06:44 +01:00
HbmMods
1a24b8df67
Merge pull request #1928 from Toshayo/master
Night vision toggling with HUD
2025-02-10 08:02:31 +01:00
HbmMods
2968d927bc
Merge branch 'master' into master 2025-02-10 08:02:24 +01:00
George Paton
98a334575d forgot the jigsaw block side rotating code 2025-02-10 15:57:03 +11:00
George Paton
0dea47ff87 add glowstone loot and force 3x3loot to always spawn, even at size limit 2025-02-10 12:21:45 +11:00
George Paton
8994d2e0b1 add nbt vertibird spawning and remove unused meteor dungeon code 2025-02-10 12:21:17 +11:00
George Paton
c1a2f8d270 stack jetpack tanks to 16, and don't consume them if jetpack is already full 2025-02-10 11:43:30 +11:00
George Paton
7f0c483cb1 improved meteor dungeon stair piece, added loot fallback, and prevent structures generating too far horizontally from the start point 2025-02-10 11:36:31 +11:00
BallOfEnergy
aceb313fec Merge remote-tracking branch 'refs/remotes/upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/handler/WeaponAbility.java
#	src/main/java/com/hbm/items/weapon/sedna/factory/Orchestras.java
#	src/main/java/com/hbm/tileentity/TileEntityLoadedBase.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineRotaryFurnace.java
2025-02-09 18:02:29 -06:00
BallOfEnergy
352cee350f Merge remote-tracking branch 'origin/Optimization' into Optimization 2025-02-09 18:01:03 -06:00
BallOfEnergy
e2d64ff376 Fix for main issue #1933. 2025-02-09 18:00:52 -06:00
George Paton
977bd3e2b5 Add access transformer for mojang being a stupid butt 2025-02-10 09:59:06 +11:00
Bob
5341f5d255 EOTT 2025-02-09 18:38:30 +01:00
George Paton
4fb7df8b3e Merge branch 'master' into moige 2025-02-09 18:39:57 +11:00
George Paton
3dbe648ebe bring NBTStructures to NTMain! 2025-02-09 18:39:15 +11:00
Bob
f74ce297f8 chromatic aberration 2025-02-08 23:19:33 +01:00
darkalit
4a95dc1240 Return OC integration with Energy storage block 2025-02-07 23:57:28 +02:00
Toshayo
b462b30156
Night vision toggling with HUD 2025-02-07 13:07:39 +01:00
Boblet
b60db5b911 pain 2025-02-06 16:48:29 +01:00
HbmMods
fe9808f621
Merge pull request #1924 from Dash1269/ntmain-pa-detector-fix
PA Detector fixes and improved diagnostics
2025-02-06 15:00:30 +01:00
Boblet
8522b584d4 undo all of the PA stuff 2025-02-06 15:00:19 +01:00
Dosh
5f1a4509f2
PA Detector fixes and improved diagnostics 2025-02-07 00:08:31 +11:00
Boblet
bd59ae5970 flixes 2025-02-05 16:45:49 +01:00
HbmMods
d4d5340a33
Merge pull request #1920 from Creeper-banner/bob
Update zh_CN.lang for X5230
2025-02-05 11:17:02 +01:00
Creeper-banner
2f2c2438d5
Add files via upload 2025-02-05 17:47:58 +08:00
HbmMods
d363177e7f
Merge pull request #1917 from TheCrazyInsanity/master
Simple Github action to build on push & pr
2025-02-05 08:06:21 +01:00
HbmMods
1f5c58b7bb
Merge pull request #1914 from Nycticoraxnightheron/master
zh_CN update
2025-02-05 08:04:42 +01:00
Boblet
27bd64eafc a botched nosejob 2025-02-04 16:54:02 +01:00
TheCrazyInsanity
4b32e2665b
I forgot to make it upload artifacts
:3c
2025-02-03 18:01:30 -05:00
TheCrazyInsanity
7206cad26a
Create build.yml
Github actions template to build an artifact on push or pr
2025-02-03 17:50:45 -05:00
Boblet
a814e581b9 time to eat 40lbs of dynamite then die 2025-02-03 16:24:41 +01:00
Night Heron
3b1a578d71
I hate eszopiclone 2025-02-03 14:57:30 +08:00
George Paton
c49161ab39 Merge branch 'master' into moige 2025-02-03 10:44:17 +11:00
George Paton
a581cb74d0 Refueling Station! Refuels armor, attached armor mods, and any held items! Now Black Mesa themed! 2025-02-03 10:38:47 +11:00
Bob
6027ad963b fuck off 2025-02-02 22:05:58 +01:00
HbmMods
201689942a
Merge pull request #1905 from 70000hp/Aluminium-fifth-attempt-at-merging
Aluminium 2
2025-02-02 17:29:49 +01:00
HbmMods
26a2a46958
Merge pull request #1910 from Creeper-banner/bob
Update zh_CN.lang
2025-02-02 17:25:19 +01:00
Bob
0e0777f196 the rim flappe on a bongfish is mated to the bungus of its fuccbone.
the scrotewad is onyl present on females above the pootsack (see: snogbag).
2025-02-02 17:21:34 +01:00
70000hp
32d6a59991
Update ElectrolyserFluidRecipes.java 2025-02-01 11:43:27 -05:00
George Paton
18af968073 updated boble 2025-02-01 20:21:46 +11:00
George Paton
6d920ce91d sorters default to bedrock sorting now too 2025-02-01 20:02:21 +11:00
George Paton
c4e973dc03 oops: fix sorter filter crash 2025-02-01 20:00:24 +11:00
George Paton
b6d4e95ec9 bedrock ore grade filters! 2025-02-01 19:35:46 +11:00
Creeper-banner
232c626c31
Add files via upload 2025-02-01 15:04:19 +08:00
Creeper-banner
b4a7d5a197
Merge branch 'HbmMods:master' into bob 2025-02-01 14:04:49 +08:00
70000hp
dd84cf8f7c ratio engoodening 2 + fluorite instead of aluminium powder 2025-01-31 12:29:42 -05:00
Boblet
98aea38025 hey lois look i'm a commit message 2025-01-31 15:24:14 +01:00
Boblet
d8ab0e7ecf 1000 lines of code 2025-01-30 16:01:05 +01:00
70000hp
4e28272444 eh why not 2025-01-29 17:04:30 -05:00
70000hp
6e3e702213 my bones 2025-01-29 16:32:23 -05:00
Boblet
691ff5c1d5 floppotron 2025-01-29 16:37:12 +01:00
Bob
a074a4a249 the escape plan 2025-01-28 23:24:40 +01:00
Boblet
bc3e643f97 a touch too much 2025-01-28 16:37:59 +01:00
Boblet
03639e2cdb i'm just gonna call this "gock" with no further context 2025-01-28 13:15:41 +01:00
Boblet
841864e368 the blombus 2025-01-27 16:55:41 +01:00
HbmMods
64f5bbe4bb
Merge pull request #1891 from t3435ryt/oc-compat
Add OpenComputers Compatibility for Combustion Engine 2
2025-01-27 08:24:03 +01:00
HbmMods
3649ed45cf
Merge pull request #1894 from MellowArpeggiation/master
Fix foundry channel clogs
2025-01-27 08:21:50 +01:00
George Paton
e65a98421f handle shovels and prevent any unforeseen issues (like if a channel gets separated by breaking/explosion) 2025-01-27 10:13:11 +11:00
Bob
15645648c5 sharticle accelerator 2025-01-26 22:09:21 +01:00
George Paton
8634d63625 Prevent contiguous foundry channels from accepting different materials until fully emptied, preventing clogs 2025-01-26 12:31:35 +11:00
Bob
fb1e20c11f 🅱️all 🅱️usting 2025-01-25 20:25:01 +01:00
t3435ryt
0222ebfaf9 Fix stupidity 2025-01-24 20:42:44 -05:00
t3435ryt
1274fdcbac Add OpenComputers Compatibility for Combustion Engine 2025-01-24 20:09:36 -05:00
Boblet
02d749bdb1 spread it 2025-01-24 14:57:21 +01:00
Boblet
11e96c08c0 porting of the ports 2025-01-23 16:49:42 +01:00
Boblet
31eeb2ab94 heaven sent & hell bent 2025-01-22 16:55:52 +01:00
Boblet
4024249bec deplorable gollompus 2025-01-21 16:44:09 +01:00
Boblet
c03801f3af killing myself (flirting) 2025-01-20 16:28:35 +01:00
HbmMods
2d007e836f
Merge pull request #1873 from Agarmal/OpenComputers-Better-Integration
Add vent carbon dioxide function in Zirnox for OpenComputers
2025-01-20 08:10:37 +01:00
Bob
6373c09081 PERFLUOROMETHYL WANTS TO KNOW YOUR LOCATION 2025-01-19 22:45:37 +01:00
Boblet
986276428e no 2025-01-17 15:20:28 +01:00
Agarmal
097d933205 Clamping now uses MathHelper.clamp_int(...) 2025-01-17 11:49:28 +01:00
Agarmal
fa0f3cb0ed Added value clamping to the ventCarbonDioxide function on the Zirnox, also no longer writes the value before correcting if it's negative. 2025-01-17 11:01:01 +01:00
HbmMods
4a79942421
Merge pull request #1871 from FOlkvangrField/RBMK-Crane-Console-Fix
Fix RBMK Crane Console
2025-01-17 08:50:22 +01:00
Boblet
8bcdd0cc89 the heinous sludge has consumed my brain 2025-01-16 16:52:33 +01:00
Agarmal
b7d416cd8a Added vent Carbon Dioxide function in Zirnox for OpenComputers 2025-01-16 15:00:17 +01:00
Boblet
40379c75b0 ough 2025-01-15 16:55:24 +01:00
FOlkvangrField
d2b28f4275 Fix RBMK Crane Console
Fixed RBMK Crane Console moving problem. I actually don't know how the new packet sending code works. I compared the posLeft variable with the similar posFront variable and found that it performed an additional operation during deserialization, so I removed it, and this fix the problem that RBMK Crane Console can't  move left or right
2025-01-15 19:36:37 +08:00
HbmMods
de1bcfd35a
Merge pull request #1865 from Biohazard041/master
Typo Fixes
2025-01-14 16:52:08 +01:00
Boblet
b68e275dd6 progress nonexistant 2025-01-14 16:51:33 +01:00
Biohazard041
57bdd1fba0
Update GUIRBMKControlAuto.java
Typo :)
2025-01-13 23:28:17 -05:00
Biohazard041
2114beccd2
Update ItemModCladding.java
typo from resistence to resistance

:)
2025-01-13 23:23:38 -05:00
Boblet
c7fede2304 hit that yoinky sploinky 2025-01-13 16:26:40 +01:00
BallOfEnergy
642945e7ac
Merge branch 'HbmMods:master' into Optimization 2025-01-13 08:16:55 -06:00
BallOfEnergy
9fa148c218 just in case I disappear, here's particle threading and crate backpacks, along with spider crates, though opening a spider crate in the inventory will not spawn spiders yet. 2025-01-12 19:21:17 -06:00
Bob
401005c3d8 you know how we do it 2025-01-13 00:24:50 +01:00
Boblet
f39a5b1556 🅱️alls with reverb 2025-01-09 16:52:13 +01:00
HbmMods
8f325e9a5b
Merge pull request #1857 from BallOfEnergy1/Optimization
Miscellaneous fixes for the optimization update.
2025-01-09 08:30:08 +01:00
BallOfEnergy
19af9d769d Fix #4.
Fix timed bombs not showing a time.
2025-01-08 20:48:53 -06:00
BallOfEnergy
6d06227922 Fix #3.
Fix corrupted broadcaster playing inversely.
2025-01-08 20:31:33 -06:00
Boblet
d4c0cb017a spoingus 2025-01-08 16:47:43 +01:00
BallOfEnergy
be01e9efd0 Fix #2.
Packets decaying way too quickly with large bases, remove total time counter.
2025-01-08 08:31:51 -06:00
BallOfEnergy
3882b9b82c Fix #1.
Fix custom machine crashing clients/invalidating packets due to buffer underflow.
2025-01-08 08:20:49 -06:00
HbmMods
5746a90cb7
Merge pull request #1853 from Nycticoraxnightheron/master
zh_CN update
2025-01-07 16:46:01 +01:00
Boblet
9ef98691f6 do the yoinky sploinky 2025-01-07 16:44:33 +01:00
Night Heron
c71647674b
Oh yes♂sir
Oh yes♂sir
2025-01-07 21:44:29 +08:00
HbmMods
702914f03a
Merge pull request #1851 from Vaern/phosphor
Phosphor Vines
2025-01-07 08:20:15 +01:00
Vaern
faf57d6b9c Merge remote-tracking branch 'HbmMods/master' into phosphor 2025-01-06 13:12:04 -08:00
Bob
c34c412810 top 5 videos 2025-01-06 19:56:48 +01:00
HbmMods
3400fed16e
Merge pull request #1843 from Xenox003/master
Add Look overlay to Leviathan Turbine
2025-01-06 18:22:44 +01:00
HbmMods
cc1b56fa9f
Merge branch 'master' into master 2025-01-06 18:22:36 +01:00
HbmMods
50edd0f04b
Merge pull request #1845 from Agarmal/m1tty-nvg
Fix effect conflicts with Night Vision Goggles in the M1TTY Environment Suit
2025-01-06 18:20:23 +01:00
Bob
ae431a3a9b can a special weapon have a b-side? 2025-01-06 18:19:56 +01:00
HbmMods
4a1bb38541
Merge pull request #1733 from BallOfEnergy1/Optimization
NTM Optimization Update!
2025-01-06 15:38:30 +01:00
BallOfEnergy
6bc70ae105 Small fix for upgrades on TileEntityElectrolyser. 2025-01-06 00:09:36 -06:00
BallOfEnergy
34e818b83a Wow, that was bad.
Fix fluids randomly disappearing/appearing in the Heat Exchanging Heater in rare circumstances due to packet compilation times.
2025-01-05 19:19:02 -06:00
BallOfEnergy
8bbb01ae2b Merge remote-tracking branch 'origin/Optimization' into Optimization 2025-01-05 16:28:06 -06:00
BallOfEnergy
dc6f30ba6c Fix TileEntityBroadcaster. 2025-01-05 16:27:47 -06:00
HbmMods
301b66b4f7
Merge branch 'master' into Optimization 2025-01-05 22:39:26 +01:00
Bob
ba12143cc8 🅱️alls 2025-01-05 22:37:16 +01:00
BallOfEnergy
ec6cd544d2 An absolute ton of cleanup. 2025-01-04 01:04:57 -06:00
BallOfEnergy
c25f4c8d60 Fix /ntmpackets command registration.
Fix small race condition with a ReentrantLock.
2025-01-03 20:29:17 -06:00
Agarmal
8391255398 Fixed M1TTY Envsuit mod detection 2025-01-02 20:38:22 +01:00
Agarmal
62116cfb32 Added a check to fix M1TTY's Envsuit incompatibility with NVG goggles 2025-01-02 19:33:16 +01:00
Xenox003
f1bb5f1d17
chore: Update changelog 2025-01-02 00:32:38 +01:00
Xenox003
c94292a667 feat: Add look overlay to Leviathan Turbine (aka. Big Chungus) 2025-01-02 00:10:38 +01:00
BallOfEnergy
9a22c343c9 Chicago Pile fix ClassCastException. 2024-12-31 17:18:04 -06:00
BallOfEnergy
86de688469
Merge branch 'HbmMods:master' into Optimization 2024-12-29 05:58:39 -06:00
BallOfEnergy
c941cb8717 am i retarded
fucky wucky pt. 4
2024-12-29 05:56:26 -06:00
BallOfEnergy
fe23c67967 fucky wucky pt. 3 2024-12-29 05:52:19 -06:00
HbmMods
5cf06f2055
Merge pull request #1837 from Nycticoraxnightheron/101
zh_CN update
2024-12-29 12:42:49 +01:00
BallOfEnergy
78aba275ce fucky wucky pt. 2 2024-12-29 05:41:53 -06:00
Night Heron
c1cea71240
Add files via upload 2024-12-29 00:26:31 +08:00
BallOfEnergy
803320d118 Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/main/ResourceManager.java
2024-12-27 17:57:20 -06:00
HbmMods
5c053ea78f
Merge pull request #1833 from Vaern/idk
added new g3 wooden + polymer tex, fixed uv
2024-12-28 00:31:02 +01:00
Bob
dbcb2e2aa2 spontaneous comeback 2024-12-28 00:16:38 +01:00
Vaern
e4b5b40256 added new g3 wooden + polymer tex, fixed uv 2024-12-26 23:37:57 -08:00
BallOfEnergy
e1bdae1241 Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/blocks/ModBlocks.java
#	src/main/java/com/hbm/lib/HbmCollection.java
#	src/main/java/com/hbm/main/ClientProxy.java
#	src/main/java/com/hbm/main/MainRegistry.java
#	src/main/java/com/hbm/main/ModEventHandler.java
#	src/main/java/com/hbm/main/NEIConfig.java
#	src/main/java/com/hbm/util/LootGenerator.java
2024-12-26 19:43:36 -06:00
BallOfEnergy
9d3a3b1fff fucky wucky (kms) 2024-12-26 19:27:31 -06:00
Bob
89a3a1f9bc fixes 2024-12-27 01:01:51 +01:00
Bob
d7776b52d5 roblox death sound 2024-12-23 23:56:43 +01:00
HbmMods
e04e5aff1d
Merge pull request #1821 from MellowArpeggiation/master
A few animation fixes more
2024-12-23 21:32:18 +01:00
Bob
1bccba82bb god giveth, and god taketh away 2024-12-23 21:31:33 +01:00
George Paton
2613902a73 wrong swizzle order 2024-12-23 12:57:21 +11:00
George Paton
cca5300deb
Merge branch 'HbmMods:master' into master 2024-12-23 12:43:26 +11:00
George Paton
d56f30a4fa properly add rotmode to animation .json spec, including import/export 2024-12-23 12:33:21 +11:00
Bob
6e44aeea8d return the slab, or suffer my curse 2024-12-23 01:01:29 +01:00
Bob
10f62b88e1 the malicious gigglefish from the silly dimension 2024-12-22 00:41:10 +01:00
BallOfEnergy
9d2aa86e41 well crap this was an oops 2024-12-21 12:40:11 -06:00
BallOfEnergy
88c1632481 fix some stuff, also fix sending exactly 19x more packets than needed lmao 2024-12-20 17:54:45 -06:00
Bob
340de04936 tweaks 2024-12-20 21:46:50 +01:00
BallOfEnergy
90cfd37a31 an absolutely goofy command I'd say (also yet another failsafe, this time for a ton of packet discarding.) 2024-12-19 21:55:41 -06:00
BallOfEnergy
4f06914c39 Packet threading debug command!!
(Also packet threading config option)
2024-12-18 10:52:33 -06:00
BallOfEnergy
6ccb585c40
Merge branch 'HbmMods:master' into Optimization 2024-12-18 09:43:40 -06:00
Boblet
1930670e5f pins and needles 2024-12-18 16:37:11 +01:00
BallOfEnergy
1ffebc5aa2 Merge remote-tracking branch 'origin/Optimization' into Optimization 2024-12-18 08:32:42 -06:00
BallOfEnergy
85743e85f4 More RAM optimizations with buffer releasing. Also fix a bug in RBMK processing and a few merge-related errors. 2024-12-18 08:32:30 -06:00
HbmMods
6d1243b500
Merge pull request #1812 from Nycticoraxnightheron/101
I forgot the oven, but it is done
2024-12-18 08:16:51 +01:00
BallOfEnergy
7a0ee15a7e
Merge branch 'HbmMods:master' into Optimization 2024-12-17 10:51:51 -06:00
Night Heron
d1d20ec4bb
Add files via upload 2024-12-18 00:43:26 +08:00
Boblet
bfdc145eb0 smonking that fentanyl 2024-12-17 16:51:02 +01:00
George Paton
67eb2be5a7 Add swizzling for animations not authored with YZX rotations within blender (haven't updated the import/export yet) 2024-12-17 19:55:37 +08:00
HbmMods
807f1a7525
Merge branch 'master' into Optimization 2024-12-17 11:38:41 +01:00
Boblet
9b149f3e3d trash incineration 2024-12-17 11:37:37 +01:00
George Paton
700e02223f read the damn headers, shitlid 2024-12-17 16:03:07 +08:00
BallOfEnergy
7a16a8ba9f Merge remote-tracking branch 'origin/Optimization' into Optimization
# Conflicts:
#	src/main/java/com/hbm/main/ModEventHandlerClient.java
#	src/main/java/com/hbm/util/CompatExternal.java
2024-12-16 18:25:14 -06:00
BallOfEnergy
2776a6f347 Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/blocks/ModBlocks.java
#	src/main/java/com/hbm/handler/EntityEffectHandler.java
#	src/main/java/com/hbm/main/ClientProxy.java
#	src/main/java/com/hbm/main/CraftingManager.java
#	src/main/java/com/hbm/main/MainRegistry.java
#	src/main/java/com/hbm/main/ModEventHandlerClient.java
#	src/main/java/com/hbm/main/ModEventHandlerRenderer.java
#	src/main/java/com/hbm/main/NEIConfig.java
#	src/main/java/com/hbm/main/ResourceManager.java
#	src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java
#	src/main/java/com/hbm/tileentity/turret/TileEntityTurretRichard.java
#	src/main/java/com/hbm/tileentity/turret/TileEntityTurretSentry.java
#	src/main/java/com/hbm/tileentity/turret/TileEntityTurretTauon.java
#	src/main/java/com/hbm/util/CompatExternal.java
#	src/main/java/com/hbm/util/CrucibleUtil.java
#	src/main/java/com/hbm/util/EntityDamageUtil.java
2024-12-16 18:18:46 -06:00
HbmMods
78d61348bf
Merge pull request #1767 from FOlkvangrField/Custom-fluid-pollution-fix
Custom fluid traits fix
2024-12-16 16:08:51 +01:00
HbmMods
74a87e90e8
Merge pull request #1805 from Nycticoraxnightheron/101
Repair of zh_CN files
2024-12-16 16:07:25 +01:00
Boblet
ce3bff94eb let's go to stalingrad, it will be fun 2024-12-16 15:59:41 +01:00
FOlkvangrField
d009f614d4
Merge branch 'master' into Custom-fluid-pollution-fix 2024-12-16 22:56:43 +08:00
Night Heron
42d52fe060
Add files via upload
i love  my hand
2024-12-16 12:18:34 +08:00
Bob
c60f5cf400 been livin' livid in a mirror maze 2024-12-15 20:50:16 +01:00
Bob
28ae1df25e now that was a rather productive segment 2024-12-14 22:05:48 +01:00
BallOfEnergy
99705897ed Merge remote-tracking branch 'main/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/blocks/ModBlocks.java
#	src/main/java/com/hbm/handler/EntityEffectHandler.java
#	src/main/java/com/hbm/main/ClientProxy.java
#	src/main/java/com/hbm/main/CraftingManager.java
#	src/main/java/com/hbm/main/MainRegistry.java
#	src/main/java/com/hbm/main/ModEventHandlerClient.java
#	src/main/java/com/hbm/main/ModEventHandlerRenderer.java
#	src/main/java/com/hbm/main/ResourceManager.java
#	src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java
#	src/main/java/com/hbm/tileentity/turret/TileEntityTurretRichard.java
#	src/main/java/com/hbm/tileentity/turret/TileEntityTurretSentry.java
#	src/main/java/com/hbm/tileentity/turret/TileEntityTurretTauon.java
#	src/main/java/com/hbm/util/EntityDamageUtil.java
2024-12-13 12:04:21 -06:00
Bob
c8fe1f3423 my bals 2024-12-12 21:44:32 +01:00
Boblet
bbce45170e why is it called land-mine when it doesn't even belong to me 2024-12-12 16:37:05 +01:00
Boblet
fbe97e8d79 people turn off PVP? 2024-12-11 16:06:51 +01:00
Boblet
7695c189ea too late to turn tail, too good to fail 2024-12-09 16:12:09 +01:00
Bob
f49b832c96 fuck 2024-12-08 22:30:42 +01:00
Bob
da407e6b31 do you dare take a spookie dookie in the skoilet? 2024-12-07 22:48:32 +01:00
Boblet
ddaa086354 armor desc overhaul 2024-12-06 15:19:19 +01:00
Boblet
096c4f4941 hawk tuah 2: eagle tuah 2024-12-05 16:33:13 +01:00
Bob
938d9935bf infrared laser heat ray fuck 2024-12-04 23:30:53 +01:00
Boblet
3e8000a166 get skullanized, idiot 2024-12-04 15:50:59 +01:00
Boblet
ba855a8c0f added high-power skeletonizer engine 2024-12-04 12:06:01 +01:00
Bob
49429c73d9 kill me 2024-12-03 22:27:09 +01:00
Boblet
663f08be56 lasers now turn entities into confetti 2024-12-03 16:40:56 +01:00
Boblet
3b0fe9c14b don't work hard, work smart (while hard) 2024-12-02 14:07:38 +01:00
Bob
142f6a992d ouugh 2024-12-01 20:10:43 +01:00
Bob
b8325218a8 🅱️alls 2024-12-01 00:52:17 +01:00
Boblet
2690b3e96f i want a woman who straight up fucking kills me 2024-11-29 15:05:36 +01:00
Boblet
38ecb23a8e more stupid shit 2024-11-28 16:59:33 +01:00
Bob
dcdc2d9032 yes that deserves its own commit 2024-11-27 23:11:13 +01:00
Boblet
78fa7b2355 variants n shit 2024-11-27 16:49:44 +01:00
Boblet
771938257c fixes, tweaks and other crap 2024-11-25 16:54:25 +01:00
Bob
9192f1cf1b now you're prepped to commit homicide 2024-11-24 21:12:41 +01:00
Bob
e3d8919df5 bullets now determine projectile type, not the guns 2024-11-24 15:44:40 +01:00
Bob
24e0aff405 trotty did nothing wrong 2024-11-23 23:01:38 +01:00
BallOfEnergy1
138e1955ef Merge remote-tracking branch 'refs/remotes/upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/util/CompatExternal.java
#	src/main/java/com/hbm/util/CrucibleUtil.java
#	src/main/java/com/hbm/util/EntityDamageUtil.java
2024-11-21 16:10:02 -06:00
Bob
2a76a6af50 full set bonus handling 2024-11-21 22:15:03 +01:00
Boblet
d791e7e8e4 damage resistance handler crap 2024-11-21 16:45:59 +01:00
Boblet
4469efa601 damage handling crap 2024-11-20 16:48:37 +01:00
HbmMods
b0a90d08f7
Merge pull request #1775 from Voxelstice/turret-compat-fix
Turret CompatExternal fix
2024-11-20 15:46:19 +01:00
Voxelstice
83c209805f The curse
registerTurretTargetingCondition now should work as intended
2024-11-20 17:36:23 +03:00
Boblet
ff405e5aeb custom missile external compat 2024-11-20 09:30:02 +01:00
BallOfEnergy1
3d1ff54dd7 uh oh 2024-11-19 14:43:49 -06:00
BallOfEnergy1
53f20f67a0 Merge remote-tracking branch 'refs/remotes/upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/main/ModEventHandlerClient.java
#	src/main/java/com/hbm/main/ResourceManager.java
#	src/main/java/com/hbm/util/EntityDamageUtil.java
2024-11-19 14:42:25 -06:00
Bob
98ed3fad91 more bolter crap, various fixes 2024-11-18 23:22:15 +01:00
Bob
86e5cd71ce imaginary technique: blunt force trauma 2024-11-17 20:10:30 +01:00
Bob
25b0f19fc7 localization 2024-11-16 22:57:17 +01:00
Bob
9e5724fc5f rather death do us part than shit do its fart 2024-11-16 20:55:43 +01:00
HbmMods
c7f73e2c1d
Merge pull request #1770 from Vaern/hbm
hangman model + texture
2024-11-16 20:54:36 +01:00
Vaern
813f7378bc hangman model + texture 2024-11-16 11:51:37 -08:00
Bob
d66b75b76c "i was in the war" congratulations, i'm gonna be in the next one and
they have laser beams now
2024-11-14 22:50:38 +01:00
Boblet
5e57c86f57 the incredibly impractical mechanism 2024-11-14 16:36:59 +01:00
FOlkvangrField
146e19d463 custom fluid traits fix
Fixed some custom fluid traits buds, like the JSON output error of the polluting trait and the java.lang.InstantiationException issue of the PWRModerator and Pheromone traits. Mean while, the hot reload function of hbmFluidTypes.json and hbmFluidTraits.json has been added.
2024-11-14 21:13:13 +08:00
Bob
ddcb554664 boilerplate crap so i can pretend like i was productive today 2024-11-13 19:09:47 +01:00
HbmMods
e95123c359
Merge pull request #1763 from MellowArpeggiation/master
inspect, jammed, and dry fire animations for SPAS-12
2024-11-13 08:07:56 +01:00
George Paton
586d71911b add Steyr animations 2024-11-13 18:03:33 +11:00
George Paton
08a72afecc add audio to inspect and jammed SPAS-12 animations 2024-11-13 10:07:08 +11:00
Boblet
19bce7c342 explosive fucking buckshot from a peneumatic warhead yeeter 2024-11-12 16:24:31 +01:00
George Paton
26148a277d inspect, jammed, and dry fire animations for SPAS-12 2024-11-12 12:18:11 +11:00
Bob
6bd5c8577b finishing touches on the portable mass extinction machine 2024-11-11 21:23:23 +01:00
Boblet
062fe4205f legalize nuclear bombs 2024-11-11 16:46:46 +01:00
Bob
049bc8c31b go go gadget delete everything in this general area 2024-11-10 22:30:36 +01:00
BallOfEnergy
e3e306b24f small flixes 2024-11-09 23:33:50 -06:00
BallOfEnergy
6e39abcb1a oops, bugfixes!
- Pooled buffers removed due to issues with releasing the memory.
- ExtProps fixed for players/entities; improper deserialization.
2024-11-09 18:48:49 -06:00
BallOfEnergy
9409fba056 Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/main/ResourceManager.java
2024-11-09 17:09:17 -06:00
BallOfEnergy
0cc19a4ca4 Merge remote-tracking branch 'origin/Optimization' into Optimization 2024-11-09 17:05:09 -06:00
BallOfEnergy
4bd6f0df53 More shit, also precompiled packets.
also holy shit the whitespace changes, intelliJ wanted to optimize the imports and refactored a ton of whitespace in the process.
2024-11-09 17:04:19 -06:00
Bob
287569fe45 if you hold your foreskin shut while peeing you can do a charged shot 2024-11-09 22:53:29 +01:00
Boblet
cb14ffc638 shotshell recipes, some tweaks 2024-11-08 15:11:01 +01:00
Bob
7d88f73dc6 black powder effects 2024-11-07 22:00:56 +01:00
BallOfEnergy
d056a845e0
Merge branch 'HbmMods:master' into Optimization 2024-11-07 14:46:11 -06:00
Boblet
b9787fa08e the mechanism 2024-11-07 15:50:14 +01:00
Bob
4f60e44f8e let me just *removes entire barrel* 2024-11-06 22:16:39 +01:00
Boblet
e64a21ffd3 recipe crap 2024-11-06 16:37:34 +01:00
BallOfEnergy
88759fb504
Merge branch 'HbmMods:master' into Optimization 2024-11-05 17:53:19 -06:00
Bob
446f2f8c93 stg77 texture 2024-11-05 22:05:10 +01:00
BallOfEnergy
6516ff7aa2
Merge branch 'HbmMods:master' into Optimization 2024-11-05 14:12:38 -06:00
Boblet
1e37d14de2 delete .metadata they said, it'll fix caching issues they said 2024-11-05 16:07:53 +01:00
BallOfEnergy
970485f68c there's actually so many optimizations here that it'd be impossible for be to explain them all 2024-11-04 21:34:48 -06:00
BallOfEnergy
354860c610
Merge branch 'HbmMods:master' into Optimization 2024-11-04 21:17:12 -06:00
Bob
9319fa4088 STG77 2024-11-04 22:13:10 +01:00
Boblet
e6bbd63267 ow 2024-11-04 16:59:46 +01:00
HbmMods
4e82346c5a
Merge pull request #1755 from abel1502/abel-wings
Forgot to remove debug logging
2024-11-03 22:35:55 +01:00
abel1502
7833af674f
Remove debug log spam 2024-11-04 00:34:11 +03:00
Bob
4aea1af8b5 there are spiders under my skin 2024-11-03 21:32:07 +01:00
HbmMods
98193d8e3c
Merge pull request #1753 from abel1502/abel-wings
Jetpack-like wings
2024-11-03 12:08:55 +01:00
Bob
40d5c05b64 :painB: 2024-11-02 23:45:29 +01:00
BallOfEnergy
02e9219b2e Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/extprop/HbmLivingProps.java
#	src/main/java/com/hbm/handler/EntityEffectHandler.java
2024-11-02 15:58:54 -05:00
abel1502
b58ab4520b
Fix wings rendering 2024-11-02 23:44:45 +03:00
abel1502
d39c66ded4
Extend jetpack features to wings 2024-11-02 23:10:58 +03:00
HbmMods
b6f29739a1
Merge pull request #1749 from WolfEclipses/master
German Localization Fixes
2024-11-02 14:20:36 +01:00
HbmMods
8be3cd4943
Merge pull request #1751 from abel1502/abel-take-euphy-home
Allow collecting Euphy's statue with a red key
2024-11-02 14:19:09 +01:00
HbmMods
f21d9230f5
Merge pull request #1752 from abel1502/abel-typo-1
Fix some typos
2024-11-02 14:18:10 +01:00
Bob
a0f6f56279 yet more gun crap 2024-11-02 14:16:44 +01:00
abel1502
6f309f5336
Fix some "it's" vs "its" typos 2024-11-02 02:23:07 +03:00
abel1502
6cc1c09253
Fix drops 2024-11-01 01:24:21 +03:00
abel1502
2f0c25daf8
Allow harvesting statue_elb with a red key 2024-11-01 01:11:05 +03:00
Wolf
beb221af14 new stuff 2024-10-30 23:17:24 -04:00
Wolf
f6911c7730 changes 2024-10-30 21:34:15 -04:00
Wolf
84670a93ba Fixed localization duplicates for German lang 2024-10-30 18:33:47 -04:00
Boblet
2ddb61e5a4 clearly you don't own an M47 WP aerial bomb 2024-10-30 16:50:20 +01:00
HbmMods
98d5633ba7
Merge pull request #1747 from Voxelstice/forcefield-configing
forcefield emitter becomes yet another configurable machine
2024-10-30 07:56:36 +01:00
Bob
acfb786e1a we spiked your explosives with napalm 2024-10-29 21:47:14 +01:00
Boblet
4684058634 crocket 2024-10-29 16:49:26 +01:00
Voxelstice
78cbabf1e6 implement configuration for forcefield emitter
github desktop fucking sucks
2024-10-29 12:52:21 +03:00
Bob
a37dd9e639 better afterburn mechanics 2024-10-28 22:15:34 +01:00
BallOfEnergy
73aff1d158
Merge branch 'HbmMods:master' into Optimization 2024-10-27 23:07:17 -05:00
BallOfEnergy
6443a4c391 Make ExtPropPacket ByteBuf based, along with some other performance improvements such as removing debug fluid net code and making RBMKDials more accepting of new gamerules. 2024-10-27 23:06:40 -05:00
Bob
55bced3b3e fucked up evil weapons 2024-10-27 19:02:46 +01:00
BallOfEnergy
a226685e21 Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/main/ModEventHandlerRenderer.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityPWRController.java
2024-10-26 21:17:33 -05:00
Bob
17b667bf3d HUD pain 2024-10-26 01:13:09 +02:00
Boblet
f8de5314f6 it's funny because the gun that's called "broken" is unbreakable 2024-10-25 15:01:12 +02:00
Bob
b57102e4ce four cheese pizza 2024-10-24 21:53:06 +02:00
Boblet
f4018248f1 *BOOM!* *camera zoom noise* *BOOM!* *camera zoom noise* *BOOM!* 2024-10-24 16:36:29 +02:00
HbmMods
82f60873e1
Merge pull request #1744 from MellowArpeggiation/boner-guns
Bones With Guns
2024-10-24 08:35:43 +02:00
George Paton
e94b911a5f shoot a _little_ more frequently 2024-10-24 16:36:13 +11:00
George Paton
847126b7fd inaccuracy now defines cone diameter instead of radius 2024-10-24 16:23:42 +11:00
George Paton
2fed17bac7 Add guns to spawn pool and prevent dropping of guns on death 2024-10-24 16:22:18 +11:00
George Paton
ddfe24e680 Add config option to remove skeleguns 2024-10-24 16:04:01 +11:00
George Paton
557913db64 merge and refactor new content 2024-10-24 15:28:33 +11:00
George Paton
fcfb4e5341 Merge branch 'master' into boner-guns 2024-10-24 15:21:10 +11:00
George Paton
5103577f1d Gun firing AI improvements and skeletons are only given guns when soot is high enough, higher soot adds more powerful weapons 2024-10-24 15:17:31 +11:00
Bob
867a6d38de SHREDDER 2024-10-24 00:14:24 +02:00
Boblet
8f2471986b foundry tweaks, removed more unused crap 2024-10-23 16:21:59 +02:00
Bob
8f135b80d5 .50, bacon medium grease 2024-10-22 22:06:11 +02:00
Boblet
400e0b24ed there are chemicals in my food 2024-10-22 16:36:46 +02:00
George Paton
b6bab36c7f Make guns useable by any EntityLivingBase, and add an AI handler for skeletons to fire them 2024-10-22 15:36:29 +11:00
Bob
10987bee2c lockon funsies 2024-10-21 21:11:45 +02:00
Boblet
038bb626e0 the malicious gigglefish from the silly dimension 2024-10-21 16:34:07 +02:00
BallOfEnergy
b588919736 pushing to prod without testing
woo!!
2024-10-20 14:24:04 -05:00
Bob
17b4a355e5 stinger crap 2024-10-20 20:39:25 +02:00
BallOfEnergy
b64ab034c7 Merge remote-tracking branch 'origin/Optimization' into Optimization 2024-10-20 13:05:55 -05:00
BallOfEnergy
31c6809c65 Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/main/ModEventHandlerRenderer.java
2024-10-20 12:54:06 -05:00
Bob
b72a52ef69 imagine looking at indev values and going "yeah this is definitely final
imagine being this much of a fucking idiot, but good thing we aren't that stupid, right? good thing we aren't complete fucking retards who stir though code that is in active development, pick out temporary inconsistencies and then going "oh well the dev must clearly be an idiot, how else could you explain that?", good thing we are reasonable people who aren't this fucking stupid, right?
2024-10-19 21:48:29 +02:00
HbmMods
6898ebe07a
Merge pull request #1739 from Vaern/hbm
added g3 model + wip texture
2024-10-19 14:14:25 +02:00
Bob
be1b1c1df0 one shotgun, two shotgun 2024-10-19 00:32:07 +02:00
Vaern
ef5ed74c65 added g3 model + wip texture 2024-10-18 14:31:00 -07:00
Boblet
805c06c802 in HEAT 2024-10-18 14:13:04 +02:00
Bob
09d11d49da explosive yeeter 2024-10-17 22:22:54 +02:00
Boblet
d271382265 liquid lead cooling (preliminary version, not balanced, no need to yell) 2024-10-17 16:28:54 +02:00
Bob
7d2df857e6 spas12 2024-10-16 22:12:18 +02:00
Boblet
a1401b47e2 my ass is bleeding 2024-10-16 17:00:07 +02:00
BallOfEnergy
1841255b8d
Merge branch 'HbmMods:master' into Optimization 2024-10-15 19:37:35 -05:00
Bob
ee1d3b37cd micro uzi? wrong! macro uzi 2024-10-15 22:44:36 +02:00
Boblet
402690cb87 miserable mutant glyphids 2024-10-15 13:14:18 +02:00
HbmMods
7b8a8e5706
Merge pull request #1734 from abel1502/abel-crates-crafting-fix
Fix mass storage crafting
2024-10-15 10:53:09 +02:00
BallOfEnergy
b4b9042065 Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/tileentity/network/TileEntityCraneGrabber.java
2024-10-14 22:02:36 -05:00
BallOfEnergy
e38ce02ccf Upgrade rework, now with 3463% more caching!
(it was slow and needed a redo)
2024-10-14 22:00:39 -05:00
Bob
8e3df0cc22 comically long pistol 2024-10-14 22:56:32 +02:00
abel1502
d27a80fb30
Fix wooden mass storage crafting 2024-10-14 19:31:50 +03:00
Boblet
a9838aedd9 added new explosion effects to more bombs, grabber improvements 2024-10-14 16:48:16 +02:00
BallOfEnergy
42e200ac7a just some final tweaks to make sure that I don't fuck anything up 2024-10-13 17:04:36 -05:00
BallOfEnergy
60536af06c Merge remote-tracking branch 'upstream/master' into Optimization 2024-10-13 15:51:07 -05:00
BallOfEnergy
b63ff682fd Small fixes 2024-10-13 15:50:00 -05:00
BallOfEnergy
94c97bc87a bug fixes part 2
(both me and radium did testing)
2024-10-13 15:27:40 -05:00
Bob
047ebfe8aa better explosion particle effects, flamethrower sound loop 2024-10-13 19:49:31 +02:00
HbmMods
1927110709
Merge pull request #1729 from MellowArpeggiation/master
two bees, or not two bees
2024-10-13 17:07:34 +02:00
HbmMods
c8444cb8b7
Merge branch 'master' into master 2024-10-13 17:07:26 +02:00
Bob
ceb9abbec4 extremely shitty animations 2024-10-13 17:06:46 +02:00
BallOfEnergy
e3cf157501 bug fixes part 1
(thank you radium)
2024-10-13 00:27:55 -05:00
BallOfEnergy
5c909e156f there i fixed it :woo: 2024-10-12 22:32:58 -05:00
BallOfEnergy
ccebbbca24 Holy SHIT! i think i fixed it 2024-10-12 22:14:08 -05:00
BallOfEnergy
4d489bc938 Merge remote-tracking branch 'upstream/master' into Optimization 2024-10-12 22:13:39 -05:00
Bob
44b1604992 eh hehehehehe, fire, FIRE! 2024-10-13 01:05:06 +02:00
George Paton
e57136dc0b yeeth 2024-10-11 22:18:09 +11:00
George Paton
2e2910c2ec
Merge branch 'HbmMods:master' into master 2024-10-11 12:56:52 +11:00
George Paton
c076d4f99b bees v2 2024-10-11 12:56:22 +11:00
BallOfEnergy
063ab4032f yeah these are commits from like a month ago idk what any of this is 2024-10-10 19:44:30 -05:00
BallOfEnergy
88f5ac1cf1 Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/tileentity/TileEntityMachineBase.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityHeaterElectric.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineSolderingStation.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityPWRController.java
#	src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityCraneConsole.java
#	src/main/java/com/hbm/tileentity/network/TileEntityCraneGrabber.java
2024-10-10 19:41:23 -05:00
Bob
19cfc54dee grenade tweaks 2024-10-10 23:21:39 +02:00
Boblet
6d924cbdc5 the rim flappe on a bongfish is mated to the bungus of its fuccbone.
the scrotewad is only present on females above the pootsack (see: snogbag).
2024-10-10 16:53:11 +02:00
HbmMods
ba638e947a
Merge pull request #1727 from MellowArpeggiation/master
BONGO BONGO BONGO I DON'T WANNA LEAVE THE CONGO
2024-10-10 08:04:16 +02:00
George Paton
7c35b1923a Add Congo Lake inspect, jammed, and equip animations, also:
* fix importer breaking nested object offsets (for things like MagPlate inside Mag)
* fix sqrt3d throwing NaN on negative inputs
* >:3
2024-10-10 14:14:11 +11:00
Bob
c7ced50e67 DAY AND NIGHT 2024-10-09 23:19:54 +02:00
Boblet
66711f963e nothing productive for today 2024-10-09 16:25:43 +02:00
Bob
f2b64a82fe cursed 60s quad barrel shotgun from hell 2024-10-09 00:20:08 +02:00
HbmMods
7b127888c8
Merge pull request #1725 from MellowArpeggiation/master
Fixes to bezier fcurves
2024-10-08 20:13:25 +02:00
Boblet
86918a33e6 thorium recipe autogen 2024-10-08 16:54:52 +02:00
George Paton
9f56791abf fixes:
* NaN in `solveCubic`
* degenerate fcurves now autofix
* fix missing swizzle multiplier on export
2024-10-08 22:23:31 +11:00
HbmMods
7e9ee47d47
Merge pull request #1724 from MellowArpeggiation/master
Add support for all Blender f-curve functionality
2024-10-08 10:17:48 +02:00
George Paton
142fec169e taces -> spabs 2024-10-08 19:10:17 +11:00
George Paton
9ae58dfdb3 Support for ALL Blender fcurve functionality!! 2024-10-08 19:07:57 +11:00
Bob
6b0835f19c some very pissed off bees 2024-10-07 22:49:04 +02:00
Bob
41d8fa7478 the PWR longening 2024-10-07 20:22:48 +02:00
Boblet
5819711586 casing smoke is no longer bound to the casing config 2024-10-07 16:47:38 +02:00
HbmMods
060a21a949
Merge pull request #1722 from Vaern/hbm
swarm of angry bees
2024-10-06 22:55:43 +02:00
Vaern
78a33ddedf american 180 model + texture 2024-10-06 13:51:13 -07:00
Bob
cdec9d074d greasy joe, horse leg and 🅱️untsman 2024-10-06 22:37:16 +02:00
HbmMods
fef2074a09
Merge pull request #1715 from abel1502/abel-tiny-silex
Quick way to do #1713
2024-10-04 11:34:25 +02:00
Bob
de238ca0e0 🅱️enry 2024-10-03 21:29:20 +02:00
Boblet
c8d40f0d35 offsets and casing ejection sillies 2024-10-03 16:28:15 +02:00
abel1502
591864a406
Quick way to solve #1713 2024-10-03 13:56:33 +03:00
HbmMods
109e710112
Merge pull request #1712 from abel1502/abel-rbmk-crane
Make RBMK crane rotatable
2024-10-03 08:05:47 +02:00
Bob
59254c7179 the horngus of a dongfish 2024-10-02 22:02:19 +02:00
Boblet
ea895daa85 shells and casings 2024-10-02 16:58:12 +02:00
abel1502
5944999cf9
Fix rbmk crane rotation 2024-10-02 16:21:33 +03:00
abel1502
8da78f6895
Make RBMK crane rotatable visually 2024-10-02 14:07:32 +03:00
Bob
75df8fb945 ATLAS 2024-10-01 21:35:43 +02:00
Boblet
0bdfe286e4 shapes 2024-10-01 16:56:39 +02:00
HbmMods
a4e321f4c9
Merge pull request #1710 from abel1502/abel-strand-caster
Improve strand caster
2024-10-01 07:55:52 +02:00
abel1502
4b59c55c5a
Remove the upgrade, just change the caster 2024-10-01 00:18:24 +03:00
Bob
6cddb3e238 NEI stuff, textures 2024-09-30 22:12:21 +02:00
abel1502
63926ccd4a
Add strand caster unclogging upgrade 2024-09-30 23:04:14 +03:00
Boblet
ad3c4e20ca it's fucking lego! 2024-09-30 16:55:43 +02:00
Bob
a6f694b7b3 GUNMETAL 2024-09-29 20:56:11 +02:00
Boblet
50daf7f8dd texture sheet 2024-09-27 14:35:08 +02:00
Bob
ee895c9bfc WAR 2024-09-26 21:33:17 +02:00
Boblet
f7e804094c it's recoil! 2024-09-26 14:05:48 +02:00
HbmMods
56da81a7ae
Merge pull request #1700 from MellowArpeggiation/push-ups
Revert all that gradle bullshit and do reflection instead
2024-09-26 11:35:29 +02:00
HbmMods
d21f23287b
Merge branch 'master' into push-ups 2024-09-26 11:35:21 +02:00
George Paton
441a46f24f Revert all that gradle bullshit and do reflection instead 2024-09-26 19:27:20 +10:00
Boblet
2584934e0b ended endlessIDs 2024-09-26 11:25:11 +02:00
HbmMods
333c707a5a
Merge pull request #1698 from MellowArpeggiation/push-ups
Upstream Space Shit
2024-09-26 08:28:50 +02:00
George Paton
f2b7ce48dc fuck you gradle 4.4 2024-09-26 16:09:28 +10:00
George Paton
408a03ab47 Fix GL state leak in fluid tank rendering 2024-09-26 13:05:49 +10:00
George Paton
b36cf4213f Horizontal scaffolding 2024-09-26 12:51:29 +10:00
George Paton
8bbed76758 Basalt side textures 2024-09-26 12:50:49 +10:00
George Paton
df5df13396 Fix basalt ores and stalagmites/tites middle-clicking to sulfur 2024-09-26 12:49:40 +10:00
George Paton
5223998fcb middle click fixerrrr 2024-09-26 12:48:47 +10:00
George Paton
15a0f11a74 New basalt textures 2024-09-26 12:44:34 +10:00
George Paton
0f17007306 tabbbbbbbbbbbbbbbs 2024-09-26 12:37:36 +10:00
George Paton
70be7c4cf5 EndlessIDs compat 2024-09-26 12:27:07 +10:00
Bob
2edc4304b5 literally just better mekanism redesign alloys 2024-09-25 22:13:07 +02:00
Bob
eb157ea874 gun jamming 2024-09-25 21:47:45 +02:00
Boblet
0f277657db bullet damage, armor pen, durability stats 2024-09-25 16:45:42 +02:00
Bob
1d92bcbf13 ball and powder torture 2024-09-24 23:53:14 +02:00
Boblet
36a02151bc sure whatever 2024-09-24 16:13:39 +02:00
HbmMods
d4429aa2f8
Merge pull request #1652 from Antineutrino-4444/master
Update zh_CN.lang
2024-09-24 08:14:44 +02:00
HbmMods
d0a61f964a
Merge pull request #1694 from abel1502/abel-cache-packets
Cache tile entity network packets
2024-09-24 08:04:38 +02:00
HbmMods
3ac994c707
Merge pull request #1693 from abel1502/abel-crates-crafting
Fix #1690 (upgrading crates & mass storage)
2024-09-24 07:58:58 +02:00
Bob
b2c2ce9e4e casing ejectors, bullet ricochet 2024-09-23 22:39:38 +02:00
abel1502
c41bdc6886
Fix TileEntityScaffoldDynamic 2024-09-23 18:44:02 +03:00
abel1502
c5fa0c5d2b
Fix builder's choice concrete tooltip 2024-09-23 18:41:57 +03:00
abel1502
df92d913da
Add caching for TileEntityMachineBase update packages
Now they aren't send unless something has changed,
except for one every second as a workaround
for an apparent issue
2024-09-23 18:36:03 +03:00
abel1502
8aad7fb44b
Fix conveyor grabber delay 2024-09-23 18:21:57 +03:00
abel1502
33c8ad70a3
Expand gitignore 2024-09-23 18:21:15 +03:00
abel1502
9942632231
Fix TileEntityScaffoldDynamic 2024-09-23 16:21:57 +03:00
abel1502
cf69c0e4c0
Preserve inventories of crates and mass storages when upgrading 2024-09-23 16:20:17 +03:00
abel1502
d56a9306ff
Expand gitignore 2024-09-23 15:17:12 +03:00
Bob
42b7d1f657 dry fire animations, clicky stuff 2024-09-22 22:52:47 +02:00
Bob
51839e8abb substantial amounts of trolling 2024-09-22 00:03:28 +02:00
Boblet
fcf0f0d2d9 yet more gun stuff! 2024-09-20 15:03:52 +02:00
Bob
ca14f47cbc the malicious gigglefish from the silly dimension 2024-09-19 21:59:18 +02:00
Boblet
b65dd8ef88 minor recipe changes 2024-09-19 16:57:14 +02:00
BallOfEnergy
e7b5240a9d Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityAshpit.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityCondenser.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityCore.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityDiFurnace.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityDiFurnaceRTG.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityElectrolyser.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityFurnaceIron.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityFurnaceSteel.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoiler.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoilerIndustrial.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityHeaterHeatex.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineAutosaw.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineCombustionEngine.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineCompressor.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineEPress.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineHephaestus.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineMixer.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachinePlasmaHeater.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachinePress.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachinePumpBase.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadGen.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineSolderingStation.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineStrandCaster.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java
#	src/main/java/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java
#	src/main/java/com/hbm/tileentity/machine/TileEntitySteamEngine.java
#	src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCatalyticCracker.java
#	src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCatalyticReformer.java
#	src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCoker.java
#	src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineGasFlare.java
#	src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineLiquefactor.java
#	src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineRefinery.java
#	src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineSolidifier.java
#	src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineVacuumDistill.java
#	src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKConsole.java
#	src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlAuto.java
#	src/main/java/com/hbm/tileentity/machine/storage/TileEntityMassStorage.java
#	src/main/java/com/hbm/tileentity/network/TileEntityCraneRouter.java
#	src/main/java/com/hbm/tileentity/network/TileEntityDroneCrate.java
#	src/main/java/com/hbm/tileentity/network/TileEntityDroneRequester.java
#	src/main/java/com/hbm/tileentity/turret/TileEntityTurretFritz.java
#	src/main/java/com/hbm/tileentity/turret/TileEntityTurretMaxwell.java
#	src/main/java/com/hbm/tileentity/turret/TileEntityTurretRichard.java
#	src/main/java/com/hbm/tileentity/turret/TileEntityTurretSentry.java
#	src/main/java/com/hbm/tileentity/turret/TileEntityTurretTauon.java
2024-09-18 19:07:46 -05:00
Bob
bc2c2960e3 :PainB: 2024-09-18 21:10:11 +02:00
HbmMods
1faa1b70e2
Merge pull request #1685 from Doctor17-git/master
Updated ru_RU.lang
2024-09-18 07:48:35 +02:00
Bob
1384f14fe3 a ton of gun stuff 2024-09-17 21:30:34 +02:00
Doctor17-git
b5faedba3a
Updated ru_RU.lang
updated russian localization
2024-09-17 17:21:11 +03:00
Boblet
3a81e79554 *pipe falling sound effect* 2024-09-17 15:47:50 +02:00
Boblet
c3bc6c6bba flixes 2024-09-16 16:35:37 +02:00
Bob
ee8089ddf4 my ass is heavy 2024-09-15 22:45:57 +02:00
Boblet
2a81e2c5a7 cleanup 2024-09-13 13:17:51 +02:00
HbmMods
f806dee99f
Merge pull request #1655 from 70000hp/more-more-qol
Settings Tool
2024-09-13 08:12:16 +02:00
HbmMods
23471b1ad1
Merge branch 'master' into more-more-qol 2024-09-13 08:12:03 +02:00
BallOfEnergy
bad3d3f031
Merge branch 'HbmMods:master' into Optimization 2024-09-12 13:06:30 -05:00
HbmMods
89139ec30e
Merge pull request #1669 from 9Valjew/master
Satellite List Command
2024-09-12 16:22:41 +02:00
HbmMods
edd88aed6c
Merge pull request #1672 from 70000hp/miniscule-528-thing
tiny little baby pr
2024-09-12 16:22:13 +02:00
Boblet
85925a54dc fixes 2024-09-12 16:21:56 +02:00
Bob
00f5e8e279 keybind bullshittery 2024-09-10 21:40:39 +02:00
Boblet
699a8759a7 removed a ton of unused crap 2024-09-10 16:44:34 +02:00
70000hp
2b221c880b e
Adds a config for 528 nether burning, and makes nether burning only affect players
2024-09-09 16:04:39 -04:00
BallOfEnergy
a39dbeb2ec
Merge branch 'HbmMods:master' into Optimization 2024-09-08 21:03:31 -05:00
Bob
a0982b09fc please just shoot me 2024-09-08 23:20:53 +02:00
Bob
7f91038b08 conveyor destroyer mode 2024-09-08 21:30:47 +02:00
BallOfEnergy
2706fd2a0c
Merge branch 'HbmMods:master' into Optimization 2024-09-08 14:16:06 -05:00
9Valjews
fffad80638 Added satellite list command 2024-09-08 21:50:34 +03:00
HbmMods
59d54942a3
Merge pull request #1658 from 9Valjew/satunfuck
Xenium Resonator radar Compat
2024-09-08 17:47:07 +02:00
Bob
5d1d96e436 the almighty state machine 2024-09-08 17:45:57 +02:00
BallOfEnergy
7b65e45663 Unused import cleaning! 2024-09-06 22:31:27 -05:00
BallOfEnergy
1bd15dfa78 fixes after the merge conflicts (death) 2024-09-06 22:28:00 -05:00
BallOfEnergy
11a4d5ccf7 Merge remote-tracking branch 'origin/Optimization' into Optimization
# Conflicts:
#	src/main/java/com/hbm/tileentity/TileEntityMachineBase.java
#	src/main/java/com/hbm/tileentity/TileEntityTickingBase.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineAutosaw.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadarScreen.java
#	src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java
#	src/main/java/com/hbm/tileentity/network/TileEntityRequestNetworkContainer.java
2024-09-06 22:26:53 -05:00
Boblet
0809bc223f Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself. 2024-09-06 22:05:50 -05:00
BallOfEnergy
1195f28d8e holy shit im done (part 2) 2024-09-06 22:04:19 -05:00
BallOfEnergy
851d70d3de part 1 2024-09-06 21:59:06 -05:00
BallOfEnergy
f8e6a60d0f holy shit what the fuck am i smoking 2024-09-06 21:59:06 -05:00
BallOfEnergy
47657366cc the ByteBuf shenanigans begin!! 2024-09-06 21:59:06 -05:00
BallOfEnergy
931bbb3d8c oh my fucking god 2024-09-06 21:59:05 -05:00
BallOfEnergy
bc0d1059d8 i want to kill myself ❤️ 2024-09-06 21:59:03 -05:00
BallOfEnergy
8b5bfda162 more shit 2024-09-06 21:57:32 -05:00
BallOfEnergy
5a06075a9c fix up some imports! 2024-09-06 21:57:30 -05:00
BallOfEnergy
1aea83ad32 i fixed it i fixed it i fixed it i fixed it i fixed it i fixed it
fucking FINALLY
2024-09-06 21:57:00 -05:00
BallOfEnergy
06260e7f2b i am going to kms 2024-09-06 21:57:00 -05:00
BallOfEnergy
a2632a1785 oops 2024-09-06 21:57:00 -05:00
BallOfEnergy
841852cc81 99.999% there
just some more optimization!
(node culling)
2024-09-06 21:56:58 -05:00
BallOfEnergy
639822b48d hooolyyyy shiiiiiiiit
i finally fixed the bug!!!!!!!!!!
2024-09-06 21:56:18 -05:00
BallOfEnergy
e32f67c2b2 this is fucking insane dude
RBMK optimization update soon!!!!!!!
2024-09-06 21:55:28 -05:00
BallOfEnergy
3e487dd528 fuck! 2024-09-06 21:54:17 -05:00
BallOfEnergy
16d2d86add holy shiiiiiiiiiitttt RBMK optimization update 2024-09-06 21:54:14 -05:00
Boblet
b7d0748c26 Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself. 2024-09-06 21:39:50 -05:00
BallOfEnergy
ec15e85e4e holy shit im done (part 2) 2024-09-06 19:43:18 -05:00
Bob
49d49d47e3 this commit has a working faux first person item renderer 2024-09-06 22:11:53 +02:00
Boblet
77cb82b502 item rendering code is stored in the balls 2024-09-06 15:20:08 +02:00
Boblet
32ab93f146 gun crap 2024-09-05 16:59:14 +02:00
BallOfEnergy
f0148a12e9 part 1 2024-09-04 21:55:11 -05:00
BallOfEnergy
4b490d56a1 holy shit what the fuck am i smoking 2024-09-04 21:37:37 -05:00
Bob
833ae407e5 eh 2024-09-04 21:46:08 +02:00
Boblet
c64ca0d40c more gun code 2024-09-04 16:48:58 +02:00
Bob
d227c9d89b more gun crap 2024-09-03 22:45:18 +02:00
Boblet
a3c56e0a11 gun stuff 2024-09-03 16:00:41 +02:00
BallOfEnergy
05ca9203e9 the ByteBuf shenanigans begin!! 2024-09-02 21:39:28 -05:00
BallOfEnergy
bd25da4c1a oh my fucking god 2024-09-02 20:21:12 -05:00
Bob
13ffc6a66a refactor, new keybind system 2024-09-02 22:39:59 +02:00
BallOfEnergy
5902ff5189 i want to kill myself ❤️ 2024-09-02 15:17:07 -05:00
Boblet
2bc76661b0 fixes 2024-09-02 16:44:24 +02:00
BallOfEnergy
e7419ef76b more shit 2024-09-01 19:55:49 -05:00
Bob
5f28c8b289 more assets 2024-09-01 20:21:20 +02:00
9Valjews
37faac3266 Added Xenium Resonator radar compat 2024-08-31 23:53:23 +03:00
9Valjews
e01da0dc81 There was no fucking reason for it so be a seperate item I was just stupid 2024-08-31 23:46:46 +03:00
70000hp
0303477a14 peel off your skim 2024-08-30 18:02:45 -04:00
70000hp
be84276f92 Merge branch 'master' into more-more-qol 2024-08-30 17:34:55 -04:00
70000hp
b5f2bb3355 Merge branch 'master' into more-more-qol 2024-08-30 17:34:39 -04:00
Bob
487503fe87 shitting blood 2024-08-30 22:52:33 +02:00
Boblet
90df232e3d kickstart my shart 2024-08-30 14:43:45 +02:00
BallOfEnergy
9226af0719 fix up some imports! 2024-08-29 21:52:10 -05:00
BallOfEnergy
f245863945 Merge remote-tracking branch 'upstream/master' into RBMK_optimization
# Conflicts:
#	src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java
2024-08-29 21:47:03 -05:00
BallOfEnergy
a8051b8bd9 i fixed it i fixed it i fixed it i fixed it i fixed it i fixed it
fucking FINALLY
2024-08-29 21:44:26 -05:00
70000hp
ffcce8d9bb finishing touches 2024-08-29 20:14:29 -04:00
BallOfEnergy
07a6301774 i am going to kms 2024-08-28 22:37:13 -05:00
Boblet
556e98c0d3 i spent all day doing stupid shit 2024-08-28 16:34:49 +02:00
Bob
e11b9a2a41 lesbian ponies with weapons 2024-08-27 22:27:11 +02:00
70000hp
c135700d7e forgot about the fucking router compat 2024-08-27 15:34:07 -04:00
Boblet
85e3e50d54 ore density scanner HUD fix 2024-08-27 15:42:57 +02:00
β− Decay's Antineutrino
df2aa51f25 Update zh_CN.lang
Updated Chinese translation. Project completed using Paratranz (https://paratranz.cn/projects/11369). Translated untranslated items and refined translation of certain items. Not all items have been reviewed, and further work will be done. Credits are included in Co-Authors.

For those interested in joining the project, check the MCMOD page: https://www.mcmod.cn/class/513.html

Co-Authored-By: Creeper-banner <82984664+Creeper-banner@users.noreply.github.com>
Co-Authored-By: wdsjkkksv <174227161+wdsjkkksv@users.noreply.github.com>
Co-Authored-By: 5467864 <78838200+5467864@users.noreply.github.com>
2024-08-27 12:14:01 +08:00
Bob
b75e0a383c rm -rf 2024-08-26 21:55:37 +02:00
Boblet
a391eda01d legalize 70 ton liquid fuel rocket engines 2024-08-26 16:15:08 +02:00
BallOfEnergy
db8df184cd oops 2024-08-25 22:19:49 -05:00
BallOfEnergy
2e4bdf943f 99.999% there
just some more optimization!
(node culling)
2024-08-25 22:19:04 -05:00
70000hp
8076c77448 Last copy tool lad for a while 2024-08-25 18:10:34 -04:00
Bob
592a2f2410 go go gadget 20 kilobyte template file 2024-08-25 23:10:02 +02:00
70000hp
5de273b5ba five million billion impls
hopefully all fluid impls done outside of the rbmk stuff
Also implemented copy pasting of molten metals, copying from anything that holds molten metal, and pasting into outlets for filters
2024-08-24 14:19:54 -04:00
BallOfEnergy
05cc217bfe hooolyyyy shiiiiiiiit
i finally fixed the bug!!!!!!!!!!
2024-08-24 00:10:20 -05:00
Boblet
7e6ecdefb9 INDEX 2024-08-23 14:23:44 +02:00
Creeper-banner
e681406fec
Merge branch 'HbmMods:master' into bob 2024-08-23 18:45:08 +08:00
Bob
29fb57053d anyway 2024-08-22 22:47:06 +02:00
HbmMods
a14899ad1e
Merge pull request #1625 from RosaTryp/machine-configs
More Machine Configs!
2024-08-22 14:37:16 +02:00
HbmMods
196e544836
Merge pull request #1645 from MellowArpeggiation/master
fix missing FENSU sync (soz bob)
2024-08-22 14:33:35 +02:00
George Paton
0115928304 fix missing FENSU sync (soz bob) 2024-08-22 09:48:21 +10:00
Bob
56cded7415 go go gadget head exploder 2024-08-22 00:31:25 +02:00
RosaTryp
5d394bac15 Merge remote-tracking branch 'upstream/master' into machine-configs 2024-08-21 18:16:23 +02:00
Bob
d0725bb9f0 more battery packs 2024-08-20 23:18:54 +02:00
70000hp
65ae9b45ab some usability improvements 2024-08-20 12:17:31 -04:00
Boblet
b8d24b5c2d battery packs 2024-08-20 16:30:15 +02:00
BallOfEnergy
fce0b08056 this is fucking insane dude
RBMK optimization update soon!!!!!!!
2024-08-19 19:11:54 -05:00
Boblet
680678b5b2 🅱️attery 2024-08-19 16:38:29 +02:00
HbmMods
2f727690b0
Merge pull request #1629 from BallOfEnergy1/OC_bugfix
OC Flixes
2024-08-19 15:48:05 +02:00
HbmMods
0e2b7e09b6
Merge branch 'master' into OC_bugfix 2024-08-19 15:10:57 +02:00
HbmMods
b8eb6586f5
Merge pull request #1642 from MellowArpeggiation/master
Fix Pumpjack sync and ByteBufferize Energy Storage Blocks
2024-08-19 15:06:42 +02:00
George Paton
9ee553fe14 Fix pumpjack tank sync 2024-08-19 12:25:24 +10:00
Creeper-banner
93ca0509c4
Merge branch 'HbmMods:master' into bob 2024-08-19 07:18:01 +08:00
George Paton
402d54d669
Merge branch 'HbmMods:master' into master 2024-08-19 09:17:19 +10:00
BallOfEnergy
84d2528464 kms (fix cutting off of refinery gui) 2024-08-18 15:17:20 -05:00
BallOfEnergy
18bb7f63c4 fuck! 2024-08-18 14:30:34 -05:00
BallOfEnergy
3033d6e08e holy shiiiiiiiiiitttt RBMK optimization update 2024-08-18 14:25:33 -05:00
Bob
1caeec5ea9 d(err)ick 2024-08-18 21:00:27 +02:00
BallOfEnergy
9d59218909 aaaaaaaaaaaaa 2024-08-17 12:26:08 -05:00
Creeper-banner
1073061881
Update zh_CN.lang 2024-08-17 08:01:10 +08:00
70000hp
ec84179e3f god DAMN
Implemented switching between copiable traits + big change in logic thanks martinthedragon
2024-08-16 19:41:53 -04:00
Boblet
8597eda40f inventory peaks 2024-08-16 14:09:01 +02:00
George Paton
f58d97c007 switch TEMachineBattery to bytebuf 2024-08-16 21:57:42 +10:00
BallOfEnergy
89c97abbdc i looked back here and nearly had a fucking stroke from this code 2024-08-15 15:59:01 -05:00
BallOfEnergy
25863311bd New compatibility! This uses OpenComputer's Floppy Disk API, allowing mods to create new loot disks and add them to the tables (this took me a while; I love this system so much, it's my baby ❤️). 2024-08-15 14:13:33 -05:00
Bob
3aef7e1577 i love to drink oil 2024-08-15 20:38:22 +02:00
BallOfEnergy
148a0ab035 whoops!!! 2024-08-14 15:29:50 -05:00
BallOfEnergy
9d0e02cc61 god finally i can get rid of this
Removed Analyzable implementation; terrible idea
Fixed long-standing bug with proxy components, more NBT data!!!
2024-08-14 15:14:08 -05:00
Boblet
9707c4c961 shit 2024-08-14 16:40:42 +02:00
Boblet
6011e9df98 bedrock sellafite 2024-08-14 15:45:58 +02:00
Bob
2ac1b7f622 recipes 2024-08-13 23:27:57 +02:00
Boblet
bd8f3fd01c more fixes 2024-08-13 16:20:33 +02:00
HbmMods
fd1bb4e28d
Merge pull request #1624 from BallOfEnergy1/OC_bugfix
WOO!!
2024-08-13 11:21:53 +02:00
Boblet
1523547467 removed more crap 2024-08-13 11:21:44 +02:00
70000hp
54ec5e7028 Merge branch 'master' into more-more-qol 2024-08-12 17:44:05 -04:00
70000hp
1495dfc2b5 pain 2024-08-12 17:38:15 -04:00
Boblet
d70ea038a0 an big slappy 2024-08-12 16:26:09 +02:00
RosaTryp
8e4d4418b6 Configuration options for ashpit, leviathan turbine and all condensers 2024-08-12 13:56:45 +02:00
BallOfEnergy
b98f2350b6 man i was stupid (fix another bug with CCGT involving starting/stopping) 2024-08-11 23:40:50 -05:00
BallOfEnergy
d8f4b32c05 shit shit shit shit i forgot something 2024-08-11 22:50:31 -05:00
BallOfEnergy
c89f1b411f ughhhh
ok I fixed some bugs with OC compat and added new refinery GUI
(bugs were in CCGT `setThrottle()` function and the TELEX `setSendingText()`)
2024-08-11 22:02:54 -05:00
RosaTryp
bcdd522464 Added config options for industrial steam turbine 2024-08-12 01:26:20 +02:00
RosaTryp
b31105d4d1 Added config options to steam turbine 2024-08-12 00:55:26 +02:00
HbmMods
e6ba0d1e2b
Merge pull request #1615 from Creeper-banner/bob
Update zh_CN.lang
2024-08-10 23:12:39 +02:00
HbmMods
85d3ffae27
Merge pull request #1603 from RosaTryp/machine-configs
Added config options for centrifuge
2024-08-10 23:11:29 +02:00
HbmMods
7411908e7e
Merge pull request #1616 from MellowArpeggiation/master
I fucked up the light recipes
2024-08-10 23:10:58 +02:00
Bob
c560c7d580 missiles with more oomph 2024-08-10 23:10:28 +02:00
Creeper-banner
8fe3912259
Change lore book translations to avoid copyright problems 2024-08-10 22:05:10 +08:00
Creeper-banner
eaaa569a24
Update zh_CN.lang 2024-08-10 19:48:08 +08:00
Creeper-banner
1a5874f6a1
Update zh_CN.lang 2024-08-10 07:15:33 +08:00
George Paton
fc9443b7bf boy I hope somebody got fired for that blunder 2024-08-07 12:54:10 +10:00
Creeper-banner
9ea3196579
Update zh_CN.lang 2024-08-07 07:21:59 +08:00
Creeper-banner
73dd37eaf2
Update and rename zh_CN.lang_ to zh_CN.lang 2024-08-07 06:54:16 +08:00
Creeper-banner
aaa66fcde6
Delete src/main/resources/assets/hbm/lang/zh_CN.lang 2024-08-07 06:54:03 +08:00
Creeper-banner
0a28befc8d
Update and rename zh_CN.lang to src/main/resources/assets/hbm/lang/zh_CN.lang_ 2024-08-07 06:53:49 +08:00
Creeper-banner
0443ead08f
Update zh_CN.lang 2024-08-07 06:51:36 +08:00
Creeper-banner
f88f262383
Merge branch 'HbmMods:master' into bob 2024-08-07 06:47:03 +08:00
Bob
4aa87bc009 just fuck em 2024-08-07 00:11:18 +02:00
Creeper-banner
5217d24904
Update zh_CN.lang 2024-08-06 07:40:36 +08:00
70000hp
622330b4cf forgor 2024-08-05 19:19:24 -04:00
Bob
9ebcab3244 fixes, plushies 2024-08-05 00:47:32 +02:00
70000hp
90d552c03a the power of friendship isn't working anymore
I need to kill this motherfucker
2024-08-03 19:26:15 -04:00
70000hp
492d6520ae Merge branch 'master' into more-more-qol 2024-08-03 17:23:35 -04:00
HbmMods
522c4e1b24
Merge pull request #1608 from MellowArpeggiation/master
Accurate collision geometry on chemplant and assembler
2024-08-03 13:14:46 +02:00
Bob
aaaaac92eb fixes, recipe changes 2024-08-03 13:11:14 +02:00
George Paton
18e1542663 fuck you *adjusts your collision* 2024-08-03 19:12:30 +10:00
Bob
f97076bb94 guh 2024-08-02 23:43:19 +02:00
RosaTryp
6d33277df0
Merge branch 'HbmMods:master' into machine-configs 2024-07-31 08:10:46 +00:00
Bob
7ba7f8c6c6 models 2024-07-30 23:14:04 +02:00
RosaTryp
8aebde12bb Added config options for centrifuge 2024-07-30 22:37:51 +02:00
70000hp
d379e1e3a0 Merge branch 'master' into more-more-qol 2024-07-28 12:11:15 -04:00
Bob
44585d3c8b baa 2024-07-24 13:31:25 +02:00
70000hp
ef586c78c0 Merge branch 'master' into more-more-qol 2024-07-20 20:28:21 -04:00
70000hp
164ec9a192 Settings tool and first impl 2024-07-20 20:28:13 -04:00
Boblet
8e767e51e3 ultra shit sounds 2024-07-19 11:56:38 +02:00
Boblet
8a200a50bd better particle spawner structure, killed off boilers 2024-07-18 16:04:41 +02:00
Boblet
b3047c875e welcome to super cancer world 2024-07-17 16:38:05 +02:00
Boblet
efee0706af you can, in fact, wire a WIAJ into a particle renderer 2024-07-17 10:37:12 +02:00
Boblet
83f8c5a7f9 why 2024-07-16 16:30:03 +02:00
Boblet
02c9582b21 fuck, whatever 2024-07-15 14:29:53 +02:00
Boblet
f8465b5071 flixes 2024-07-15 13:11:13 +02:00
Bob
7896c0443a the death of RNG 2024-07-14 20:48:35 +02:00
HbmMods
eaaa78c384
Merge pull request #1584 from FOlkvangrField/Configurable-Converter
Added conversion ratio configuration options for Rf and He in hbmMachines.json for the two converters
2024-07-14 13:37:35 +02:00
Bob
e7428fb5ab camera, lights, action 2024-07-14 13:35:28 +02:00
FOlkvangrField
d17b1cb4f0 Added conversion ratio configuration options for Rf and He in hbmMachines.json for two converters 2024-07-14 19:18:49 +08:00
Boblet
01830fd877 as straightforward as the nordring 2024-07-12 14:56:47 +02:00
HbmMods
9b0bd4d180
Merge pull request #1576 from 70000hp/electrolyzer-electric-boogaloo
Electrolyzer improvements part 2
2024-07-11 16:06:06 +02:00
Boblet
28e1fdd7f5 cleanup 2024-07-11 16:05:25 +02:00
70000hp
301a932257 cant win with friends and family 2024-07-11 09:48:51 -04:00
HbmMods
6951c73aa4
Merge pull request #1521 from 70000hp/NEI-schenanigans
NEI schenanigans
2024-07-11 08:44:58 +02:00
70000hp
7f666ecaff Fixed items with meta not working + mass storage support 2024-07-10 13:38:45 -04:00
70000hp
d4e9a5d010 Autocrafter uncluttering and drag drop support 2024-07-10 13:02:30 -04:00
70000hp
851d6fb0bf Merge branch 'master' into NEI-schenanigans 2024-07-10 12:16:45 -04:00
Boblet
ef228577d9 the heinous slop 2024-07-10 16:33:33 +02:00
70000hp
8c7b359815 all my homies hate dust 2024-07-09 12:35:01 -04:00
70000hp
1797df5ac1 Merge branch 'master' into electrolyzer-electric-boogaloo 2024-07-09 11:58:40 -04:00
Boblet
27bc38caaa NEI universal handler fix 2024-07-09 16:17:23 +02:00
70000hp
9f4794e01f Merge branch 'master' into electrolyzer-electric-boogaloo 2024-07-08 17:38:25 -04:00
Bob
962686d29e blerp 2024-07-08 22:41:47 +02:00
HbmMods
958a099bac
Merge pull request #1571 from 70000hp/electrolyzer-improvements
Electrolyzer Improvements part 1
2024-07-08 21:39:57 +02:00
Boblet
ae995509e5 recipe tweaks 2024-07-08 16:56:14 +02:00
70000hp
3120268a64 Electrolyzer Improvements part 1
Changes:
Halfed recipe time for water/heavy water electrolysis
Added ore slop electrolysis recipe
Added electrolyzer overdrive support
Rebalanced the power savings upgrade
speed and overdrive upgrades now make the electrolyzer pour out faster
2024-07-08 10:16:15 -04:00
Boblet
b31cb80fa3 tweaks 2024-07-05 15:25:04 +02:00
Boblet
bcaeeab194 the funny 2024-07-04 16:04:37 +02:00
Boblet
49bfc216e6 shit nobody asked for 2024-07-03 16:10:45 +02:00
Bob
b317362c75 models 2024-07-02 23:00:19 +02:00
HbmMods
da80ec858a
Merge pull request #1569 from Doctor17-git/master
Updated ru_RU.lang
2024-07-02 14:32:51 +02:00
HbmMods
f3e354174a
Merge pull request #1568 from BallOfEnergy1/OC_bugfix
sowwy bob
2024-07-02 14:31:58 +02:00
Boblet
2eb341ee33 well that was a massive waste of time 2024-07-02 14:31:12 +02:00
Doctor17-git
492a10cdf8
Updated ru_RU.lang
updated russian localization
2024-07-02 12:03:10 +03:00
BallOfEnergy
ee32fff9be
Change default config value
100 -> 200
2024-07-02 03:20:24 -05:00
BallOfEnergy
604849c3a7
Merge branch 'HbmMods:master' into OC_bugfix 2024-07-02 02:44:50 -05:00
BallOfEnergy
867827f3a3 Merge remote-tracking branch 'origin/OC_bugfix' into OC_bugfix 2024-07-02 02:44:20 -05:00
BallOfEnergy
e1226c94be sowwy 2024-07-02 02:44:06 -05:00
Boblet
34fbf2ecbe the partitioning 2024-07-01 14:10:54 +02:00
Bob
7d1aeb378b yeah whatever 2024-06-30 18:56:27 +02:00
Bob
b111b0cff8 the slop consumes 2024-06-30 16:03:23 +02:00
HbmMods
2be3c60e59
Merge pull request #1557 from 70000hp/drone-stuffs
Drone stuffs
2024-06-30 10:13:08 +02:00
HbmMods
cd55e8d810
Merge pull request #1550 from Hacker6400/master
New it_IT.lang translation
2024-06-30 10:12:26 +02:00
HbmMods
1644cfbf91
Merge pull request #1562 from MellowArpeggiation/master
Add overlay tooltip to Solar Boiler
2024-06-30 10:11:48 +02:00
George Paton
17bee07c88 Add ILookOverlay to Solar Boiler and sync tank levels to connected clients 2024-06-30 13:15:10 +10:00
70000hp
1f4ad4bdfe Adding mellow's nice little helper function
Also includes the conveyor extractor implementing it as a reference
2024-06-29 19:28:37 -04:00
Bob
ec52959304 the creation of slop 2024-06-29 22:26:52 +02:00
70000hp
4951975d99 Merge branch 'master' into NEI-schenanigans 2024-06-29 13:40:41 -04:00
BallOfEnergy
c6868b6c6b
Merge branch 'HbmMods:master' into OC_bugfix 2024-06-28 14:37:49 -05:00
BallOfEnergy
7022dcd1af fix issues with artillery proxy OC compat
also fix a big sound system issue where other mods would run out of sound memory on the sound card if they loaded after NTM reserved 1000 CHANNELS
2024-06-28 14:37:28 -05:00
Boblet
6fff2b6195 slopper 2024-06-28 14:03:17 +02:00
Boblet
f2e9f60e0d more bedrock ore info 2024-06-28 11:52:40 +02:00
HbmMods
09af834a99
Merge pull request #1558 from BallOfEnergy1/OC_bugfix
oops (fixing OC bug)
2024-06-28 11:08:50 +02:00
BallOfEnergy
773db3c54c Merge remote-tracking branch 'origin/OC_bugfix' into OC_bugfix 2024-06-28 03:59:32 -05:00
BallOfEnergy
c2b0343d2f this was a terrible idea looking back on it
revert all the shtuff related to RBMK rods and only making them connect downwards (it would break 99% of existing setups)
2024-06-28 03:59:05 -05:00
BallOfEnergy
3bcfe743c8
Merge branch 'HbmMods:master' into OC_bugfix 2024-06-28 03:45:39 -05:00
BallOfEnergy
0e439714ea whoops... 2024-06-28 03:45:09 -05:00
HbmMods
c866e9c541
Merge pull request #1540 from BallOfEnergy1/OC_bugfix
OC Compatibility part 2: the return of the `@Callback`
2024-06-28 08:19:07 +02:00
BallOfEnergy
6c141e3841 ok this one is a pretty big bug; restructured some radar compat. 2024-06-27 22:41:47 -05:00
BallOfEnergy
0a5c4271f4 smallest fixes ever 2024-06-27 21:25:26 -05:00
BallOfEnergy
72e4cb42e0
Merge branch 'HbmMods:master' into OC_bugfix 2024-06-27 21:09:59 -05:00
70000hp
0456b5bf2a
Merge branch 'master' into drone-stuffs 2024-06-27 18:59:09 -04:00
70000hp
2dc7792860 Redstone support for logi drones 2024-06-27 18:01:04 -04:00
Bob
205742eda5 the almighty perlin noise 2024-06-27 22:19:57 +02:00
Boblet
456a7251d4 a metric fuckton of recipes 2024-06-27 16:37:13 +02:00
Bob
65d9f82b7d slop 2024-06-26 21:51:32 +02:00
Boblet
725a3a8a10 bedrock ore item autogen 2024-06-26 15:19:45 +02:00
Boblet
7eb8eef1f0 slop textures 2024-06-25 16:11:19 +02:00
70000hp
205b537318 fixed drones not placing themselves back properly 2024-06-24 17:55:13 -04:00
70000hp
f868048b1e Revert "no delay for spawning, woo"
This reverts commit 071d3603212285531eb91b0406c671811bee1810.
2024-06-24 11:52:19 -04:00
Boblet
485fbd35da combinator funnel item caching 2024-06-24 16:29:49 +02:00
Bob
b0ae1c8cee config crap, player deco and some fixes 2024-06-23 22:25:48 +02:00
Boblet
07a2dcc295 *deletes half the mod* 2024-06-21 14:36:37 +02:00
Boblet
6c96d88541 mh yes 2024-06-21 10:57:44 +02:00
Hacker6400
b9c3684969
Merge branch 'master' into master 2024-06-19 23:30:46 +02:00
Hacker6400
7023ddb5c2
Add files via upload
Added new translation
2024-06-19 23:21:26 +02:00
Boblet
79cfe0b6c4 yippie 2024-06-19 15:58:12 +02:00
Bob
a016dd906a fixes 2024-06-18 20:45:16 +02:00
70000hp
3596cfedb0 nah nvm
no recipe tweaks
2024-06-16 18:43:58 -04:00
70000hp
071d360321 no delay for spawning, woo 2024-06-16 18:37:29 -04:00
Bob
dda1025fe2 fixes and tweaks 2024-06-16 23:37:10 +02:00
Bob
10002e0c41 PRISM complete 2024-06-16 19:39:59 +02:00
HbmMods
f9075c9247
Merge pull request #1544 from Vaern/hbm
cyclotron touch-up
2024-06-16 15:10:43 +02:00
Vaern
b1b0ba0a93 flixes 2024-06-15 21:35:25 -07:00
HbmMods
a2870e17b1
Merge pull request #1542 from MellowArpeggiation/master
Fix powernet disconnections
2024-06-16 00:06:59 +02:00
70000hp
9481dd490b Drone viability improvements
increased drone speed, tweaked drone recipes
2024-06-15 12:56:34 -04:00
George Paton
7cc50e8ce3 Deglobalize the NodeWorld nodes, dimensions were all sharing the same nodespace! 2024-06-15 13:54:16 +10:00
HbmMods
95a6fa5a76
Merge pull request #1541 from Vaern/hbm
mass byte bufferization
2024-06-14 12:54:28 +02:00
HbmMods
396c53ee4c
Merge pull request #1539 from MellowArpeggiation/master
Fix grate placement crash on servers
2024-06-14 12:48:32 +02:00
BallOfEnergy
6e5b689ed2 New OC Compatibility system! 2024-06-13 20:01:10 -05:00
BallOfEnergy
9d1e20df0f ICF reactor compat done
pellet compat too

probably gonna make a base OC machine class just to fill the name field
2024-06-12 17:47:30 -05:00
Vaern
872f2beb55 mass byte bufferization 2024-06-12 15:43:19 -07:00
BallOfEnergy
b6125ac24f ITER/fusion compat done
blankets, fluid, energy, everything!
2024-06-12 16:30:29 -05:00
BallOfEnergy
45cdf2c823 launch pad compat!!
ITER compat and ICF compat next probably
2024-06-12 16:18:25 -05:00
BallOfEnergy
634804fa2e stupid 2024-06-11 22:14:22 -05:00
BallOfEnergy
7f652931a0 begin work on launch pad compat (again) 2024-06-11 22:10:31 -05:00
BallOfEnergy
a8d3d7e5bd this pisses me off bad
TELEX compatibility

yes it can do multiple lines
yes it limits the amount of characters
yes you have to do the control bytes yourself (Bell, Print, etc.)
2024-06-11 18:03:26 -05:00
BallOfEnergy
bc45b66052 Force PWR to use doubles as control rod values, round to 100s place when displaying to prevent floating-point errors looking terrible.
also add cable gauge and radar compat
telex is next
2024-06-11 16:28:59 -05:00
BallOfEnergy
f1ed151f6b add distance check and begin work on radar OC compat!!!! 2024-06-10 22:35:23 -05:00
BallOfEnergy
3dbb81f337
Merge branch 'HbmMods:master' into OC_bugfix 2024-06-10 21:21:07 -05:00
BallOfEnergy
f2ed1e897d welcome to the age of OC controlled turrets and artillery 2024-06-10 20:46:39 -05:00
George Paton
6ce3ff1a5c guraeto daze 2024-06-11 11:24:57 +10:00
Bob
5010f8812b PRISM pt. 2 2024-06-10 22:08:40 +02:00
Boblet
c645889998 flixes 2024-06-10 16:32:58 +02:00
70000hp
3195cf650e anti piracy feature begone 2024-06-09 18:03:39 -04:00
Bob
da9c44e108 *throws 155 pound anvil at you* 2024-06-09 21:03:47 +02:00
HbmMods
ca1948fa6f
Merge pull request #1533 from MerrittK/crucible
Added magtung crucible recipe
2024-06-09 10:56:21 +02:00
HbmMods
458dd79b3c
Merge pull request #1535 from BallOfEnergy1/OC_bugfix
worlds smallest PR
2024-06-09 10:55:56 +02:00
BallOfEnergy
df34a51913 another small fix 2024-06-08 22:25:59 -05:00
BallOfEnergy
dcac56d4e2 add set color function 2024-06-08 21:06:38 -05:00
BallOfEnergy
5b77cc7697 smallest fix known to man 2024-06-08 21:01:52 -05:00
Bob
a21a0934a6 the malicious gigglefish from the silly dimension 2024-06-09 01:12:53 +02:00
70000hp
d67bbe9c53 Transport drone visualization + fixed low angles for drones 2024-06-08 18:55:05 -04:00
MerrittK
1769d743be Added magtung crucible recipe 2024-06-08 13:38:45 -04:00
HbmMods
49ddcd6f85
Merge pull request #1531 from MellowArpeggiation/master
ByteBuf string reader/writer + performance improvements
2024-06-07 18:55:15 +02:00
Boblet
443d73e3ad PRISM 2024-06-07 14:45:28 +02:00
George Paton
2960c29918 Add ByteBuf string reader/writer, and migrate the biggest CPU time offenders to ByteBuf packets 2024-06-07 18:20:43 +10:00
HbmMods
6a4552a858
Merge pull request #1530 from MellowArpeggiation/master
Fix grate placement and rendering issues
2024-06-07 07:52:54 +02:00
George Paton
7d26a51c6b Fix funky placement issues 2024-06-07 14:25:46 +10:00
George Paton
0c26d45a71 Fix sunk grate side rendering, and prevent sunk placements over air blocks 2024-06-07 13:24:10 +10:00
HbmMods
b9e87b0d30
Merge pull request #1529 from MellowArpeggiation/master
grate
2024-06-06 15:43:31 +02:00
Boblet
ad45288d5f the soldering 2024-06-06 15:42:51 +02:00
George Paton
7eb8900c13 crouch-clicking is grate 2024-06-06 21:15:43 +10:00
Bob
bc1a6e17d3 balls (with reverb) 2024-06-05 21:05:41 +02:00
Boblet
14c5941bab even more throughput 2024-06-05 12:11:18 +02:00
Boblet
8618de3f1c guh 2024-06-04 16:25:19 +02:00
HbmMods
e296fbf636
Merge pull request #1525 from MellowArpeggiation/fence
fenc
2024-06-04 07:41:23 +02:00
George Paton
811a1b92c1 T and X junctions now render posts too 2024-06-04 11:23:51 +10:00
George Paton
27cf5ca091 Fence blocks can be converted into posts 2024-06-04 11:07:53 +10:00
Bob
b3cf22e91a yeah. sure. why not. 2024-06-03 21:23:36 +02:00
HbmMods
9357983184
Merge pull request #1522 from MellowArpeggiation/master
Replace codechicken MathHelper with minecraft MathHelper
2024-06-03 15:57:50 +02:00
HbmMods
891317b54d
Merge pull request #1515 from Ruslanllll/master
Reacher in 528
2024-06-03 15:54:02 +02:00
Boblet
c93ff4faaf comically expensive 2024-06-03 15:41:22 +02:00
George Paton
5241ff661b Automatic fence posts 2024-06-03 19:26:38 +10:00
George Paton
209c1b1691 Replace scala Arrays with java.util Arrays (asList is equivalent) 2024-06-03 17:13:47 +10:00
George Paton
3b160158c1 and the hits keep coming 2024-06-03 17:08:40 +10:00
George Paton
df7675c48e I _might_ be stupid 2024-06-03 17:06:57 +10:00
70000hp
dce3bf8937 fixed logistics drones obliterating items from existance 2024-06-02 19:41:06 -04:00
70000hp
543dd059af drone improvements part 1
fixed the dumb idiot logic that got it stuck all the time
2024-06-02 18:28:33 -04:00
70000hp
518a949306 my bONES 2024-06-02 12:50:52 -04:00
70000hp
eb8155b11b Container base class to make life easier 2024-06-01 15:23:47 -04:00
Bob
bdbe821d9d dosenbier 2024-05-31 10:05:09 +02:00
HbmMods
58815a0b31
Merge pull request #1517 from 70000hp/fast-stair
when the stairs (and slabs) are speedy
2024-05-31 08:31:43 +02:00
70000hp
211beb1e4c when the stairs (and slabs) are speedy 2024-05-30 19:27:33 -04:00
Ruslanllll
d99ac8508f
Reacher working in 528 mode 2024-05-30 12:55:37 +03:00
Boblet
02b56d2eb5 recipes 2024-05-29 16:46:37 +02:00
HbmMods
19c9de43b6
Merge pull request #1512 from Pvndols/master
tenfolded CCGT max power production
2024-05-28 21:58:37 +02:00
Bob
18734b77bc oredict 2024-05-28 21:01:20 +02:00
Boblet
23b710deae let's get silly 2024-05-28 16:30:14 +02:00
Pvndols
2dd5400f8f i eat batteries
tenfolded max power
2024-05-28 16:26:14 +02:00
HbmMods
d4bf13630b
Merge pull request #1508 from Vaern/fixes
Internal Renaming System for Fluids
2024-05-27 19:52:52 +02:00
HbmMods
5072f003a5
Merge branch 'master' into fixes 2024-05-27 19:52:44 +02:00
Bob
493356e73e UTI 2024-05-27 19:47:34 +02:00
Bob
6f2494b8c8 why does it hurt when i pee 2024-05-27 19:46:49 +02:00
Boblet
34092c375d bash it with a rock a couple of times 2024-05-27 16:06:06 +02:00
Vaern
6f86dc4db2 preliminary changes 2024-05-26 23:02:54 -07:00
HbmMods
9f567135d2
Merge pull request #1506 from Doctor17-git/master
Updated ru_RU.lang
2024-05-26 21:22:57 +02:00
Doctor17-git
49892f4640
Updated ru_RU.lang 2024-05-26 22:19:59 +03:00
HbmMods
a75615b8e9
Merge pull request #1505 from MartinTheDragon/master
Prevent EntityItemBuoyant from floating on falling water
2024-05-26 21:17:38 +02:00
Doctor17-git
a1fb7b6a40
Updated ru_RU.lang 2024-05-26 22:16:59 +03:00
Bob
8217dcfb1f shut the fuck up 2024-05-26 21:16:43 +02:00
MartinTheDragon
b1369a365a
Prevent EntityItemBuoyant from floating on falling water 2024-05-26 21:00:44 +02:00
Bob
b1fd87cae4 recipes, soldering station automation 2024-05-25 20:53:41 +02:00
Boblet
7dfba03dff the wire re-wireing 2024-05-24 15:03:17 +02:00
Bob
41f9b41ef9 sold(i)er TF2 2024-05-23 23:12:29 +02:00
Boblet
1f94b6b7a6 arc furnace recipe crap, soldering station 2024-05-23 16:06:43 +02:00
Boblet
6da3baf1fa arc furnace recipe autogen 2024-05-22 16:46:20 +02:00
Hacker6400
dcb2551ec9
Update it_IT.lang
I've translated all the error book of the particle accelerator
2024-05-21 21:25:17 +02:00
Bob
40cc6e009e the axe-pack 2024-05-21 21:22:32 +02:00
HbmMods
6d0095d39b
Merge pull request #1497 from Hacker6400/Hacker6400-patch-2
Hacker6400 patch 2
2024-05-21 10:43:50 +02:00
Hacker6400
058cf7cd91
Update and rename it_IT .lang to it_IT.lang 2024-05-20 22:19:04 +02:00
Hacker6400
88c0b2fba6
Delete src/main/resources/assets/hbm/lang/it_IT.lang 2024-05-20 22:18:26 +02:00
Hacker6400
dda5004fb3
Delete src/main/resources/assets/hbm/lang/it_IT - Copia.lang 2024-05-20 22:18:02 +02:00
Bob
39a855afdd lighting fix 2024-05-20 21:58:58 +02:00
Hacker6400
69098a4b99
Update and rename it_IT .lang to it_IT.lang 2024-05-20 20:04:46 +02:00
Hacker6400
4e7722530d
Delete src/main/resources/assets/hbm/lang/it_IT - Copia.lang 2024-05-20 20:04:11 +02:00
Hacker6400
d8e9b0106a
Delete src/main/resources/assets/hbm/lang/it_IT.lang 2024-05-20 20:03:47 +02:00
Bob
f39b5a0e2c crushin' crushin' (the second) 2024-05-20 19:28:46 +02:00
Hacker6400
9c5be3c86a
Update it_IT.lang
I have traslate and rewrite some words to the italian language but it's not ready yet. I think it will take some time but the result could may very good.
2024-05-20 15:44:23 +02:00
Hacker6400
9d5007fa9c
Add files via upload 2024-05-20 15:36:15 +02:00
Hacker6400
560f2c4805
Add files via upload 2024-05-20 15:33:18 +02:00
Hacker6400
f4b7e42a60
Add files via upload 2024-05-20 13:59:11 +02:00
Bob
d6a364515e more arc furnace crap 2024-05-19 23:43:31 +02:00
Bob
af53a9b09f i need to finger the wall outlet with a fork 2024-05-19 00:22:33 +02:00
Boblet
e975a558ea arc furnace stuff 2024-05-17 15:19:47 +02:00
Boblet
f9748b59f2 guh 2024-05-16 14:54:28 +02:00
Boblet
503b3b15d7 making the voices stop - angle grinder edition 2024-05-15 15:06:08 +02:00
HbmMods
384e81116a
Merge pull request #1491 from 70000hp/soot-moment-and-bugs
for the love of god
2024-05-15 07:53:57 +02:00
70000hp
342ac0dbd9 for the love of god 2024-05-14 17:28:25 -04:00
Bob
19a0bb0132 stats, fixes 2024-05-14 21:05:22 +02:00
Boblet
c38362ae2a textures, silicon 2024-05-14 16:14:27 +02:00
Bob
0365876e99 textures 2024-05-13 22:53:10 +02:00
Boblet
e12cb46093 fixes 2024-05-13 16:23:28 +02:00
HbmMods
18d807eacf
Merge pull request #1487 from Doctor17-git/master
Updated ru_RU.lang
2024-05-13 08:06:39 +02:00
Doctor17-git
a4044c8697
Updated ru_RU.lang
updated russian localization
2024-05-12 23:41:39 +03:00
Bob
e273b494a4 recipes 2024-05-12 22:32:18 +02:00
HbmMods
52821f7b52
Merge pull request #1483 from 70000hp/soot-moment-and-bugs
Soot moment and bugs
2024-05-12 12:33:33 +02:00
Bob
47d75369bd more ICF crap 2024-05-12 12:32:41 +02:00
Bob
be9a87c6af amputation 2024-05-11 20:47:19 +02:00
70000hp
81a3c19e88 Added smokestack support to fluid burning lads 2024-05-10 16:52:38 -04:00
Boblet
5558b8c2a7 finished pellet press, textures 2024-05-10 14:29:48 +02:00
HbmMods
053f5f7b77
Merge pull request #1478 from MellowArpeggiation/master
Improve RBMK render performance (and explosion rework whoops)
2024-05-09 19:31:47 +02:00
Bob
664d251e14 constant restructuring 2024-05-09 19:30:44 +02:00
George Paton
3a5a35a92a Fix indentation, ensuring all tabs 2024-05-09 11:17:44 +10:00
Boblet
ffd0b19620 ICF pellet press 2024-05-08 16:36:47 +02:00
George Paton
1c9c7f47fb
Merge branch 'HbmMods:master' into master 2024-05-08 17:48:29 +10:00
George Paton
1734e45646 Explosive block rework:
* All blocks now spawn entities when destroyed by an explosion, rather than instantly exploding
* Explosive/Waste barrels now fly off as an entity, exploding when contacting a surface
* All other explosives instead spawn a zero tick entity to prevent a stack overflow while retaining existing behaviour
* onShot behaviour added to simplify blocks that should explode when shot at
2024-05-08 13:16:20 +10:00
George Paton
d3e7a9b857 Improve RBMK render CPU performance by switching to VBOs 2024-05-07 16:16:46 +10:00
George Paton
f7dc67eef8 Fix foundry basin inventory rendering 2024-05-07 12:15:11 +10:00
George Paton
87f36271e2 wiki renderer improvements 2024-05-07 12:14:42 +10:00
70000hp
78f9d19b8d fixed bug spawning for good i hope 2024-05-06 18:29:21 -04:00
Bob
fca9fe50da GUI time 2024-05-06 21:46:30 +02:00
Boblet
ed79ad396e pellet stats 2024-05-06 15:49:48 +02:00
Bob
6c234df753 some more of that 2024-05-05 20:50:39 +02:00
HbmMods
c5ae579ab9
Merge pull request #1470 from el3ctro4ndre/master
Adding Italian translation
2024-05-05 19:21:18 +02:00
HbmMods
7ad83d5ae8
Merge pull request #1475 from Doctor17-git/master
Updated ru_RU.lang
2024-05-05 19:14:26 +02:00
HbmMods
fadd6490e8
Merge branch 'master' into master 2024-05-05 19:14:11 +02:00
Doctor17-git
6ee2acf0da
Updated ru_RU.lang 2024-05-05 20:09:33 +03:00
HbmMods
d96c0e4016
Merge pull request #1472 from MellowArpeggiation/master
Fix crash on RBMK meltdown near spotlights
2024-05-05 18:48:10 +02:00
Bob
d88dd38f20 ignition! 2024-05-05 18:44:41 +02:00
George Paton
5dedbd3728 Fix crash on RBMK meltdown near spotlights 2024-05-05 22:50:49 +10:00
Doctor17-git
2703c43365
Updated ru_RU.lang 2024-05-05 10:59:44 +03:00
Bob
39ca87d7a9 the feds are trying to poison me 2024-05-04 22:23:19 +02:00
Andrea
20b834929c
Adding more Italian translation 2024-05-04 10:48:14 +02:00
Andrea
91eb8f726c
Adding Italian translation (WIP) 2024-05-04 10:43:16 +02:00
Andrea
fd51c05a5e
Create it_IT.lang 2024-05-04 10:40:46 +02:00
HbmMods
f64daaa5c8
Merge pull request #1468 from MellowArpeggiation/master
Some more Angelica rendering fixes
2024-05-03 14:52:57 +02:00
Boblet
810038bb60 lasers, pew pew 2024-05-03 14:48:17 +02:00
George Paton
c8067c6568 Fix localization typos 2024-05-03 13:15:40 +10:00
George Paton
c8e7187481 some dingbat forgot to change some door models to the VBO loader (it's me, I'm the dingbat) 2024-05-03 13:14:44 +10:00
Bob
b72b66a083 (it's tia's PJ) 2024-05-02 22:10:02 +02:00
Boblet
696bef065e gooey 2024-05-02 16:32:04 +02:00
HbmMods
ec2468bb18
Merge pull request #1463 from 70000hp/small-tweaks
Small tweaks
2024-05-02 07:53:13 +02:00
HbmMods
338868e77d
Merge pull request #1465 from Majora320/master
Fix quotes in resource file
2024-05-02 07:52:33 +02:00
Bob
ef1e4653ce at a snail's pace 2024-05-01 20:57:51 +02:00
Moses Miller
d88e9eb1f9 Fix quotes in resource file 2024-04-30 08:19:01 -07:00
Boblet
31aa445f31 texture update 2024-04-30 15:54:22 +02:00
Bob
085bde4b99 ICF block stuff 2024-04-29 21:57:18 +02:00
70000hp
949c6dbe0b FUCK YOU GLOWSTONE 2024-04-28 11:56:33 -04:00
70000hp
51a5905546 handful of anvil scrapping recipes 2024-04-28 11:51:23 -04:00
HbmMods
2014609d51
Merge pull request #1459 from Vaern/master
Switch plutonium for neptunium from schraranium processing
2024-04-27 23:32:27 +02:00
Bob
0ab784b7c7 more ICF crap 2024-04-27 23:27:05 +02:00
Bob
cce163f84c wabbledee 2024-04-25 21:17:38 +02:00
Vaern
1efc984d43
Update SILEXRecipes.java
durgh
2024-04-24 13:56:40 -07:00
Vaern
e7324365fa
Update ElectrolyserMetalRecipes.java
hurgh
2024-04-24 13:55:43 -07:00
Vaern
5bb2a802ff
Update CentrifugeRecipes.java 2024-04-24 13:54:15 -07:00
Boblet
e4567bec16 the malicious gigglefish from the silly dimension 2024-04-23 16:11:30 +02:00
HbmMods
3331224e28
Merge pull request #1455 from Vaern/master
i had to switch gears on em
2024-04-23 08:18:07 +02:00
Vaern
0e72180e41 i had to switch gears on em, fish-tail in the rear view mirr-on em
skrttt!
2024-04-22 22:49:03 -07:00
Boblet
3ab501682d even more spring cleaning 2024-04-22 16:15:49 +02:00
Bob
0edf9a42fa and that's that 2024-04-21 21:11:36 +02:00
HbmMods
92fd9014a8
Merge pull request #1452 from 70000hp/aaargh
Aaargh
2024-04-21 18:19:32 +02:00
Bob
5934a17d90 [frantic autism music starts playing] 2024-04-21 18:13:25 +02:00
70000hp
f6ff864d21 Merge branch 'aaargh' of https://github.com/70000hp/Hbm-s-Nuclear-Tech-GIT into aaargh 2024-04-21 12:07:00 -04:00
70000hp
0bb49b1285 Merge branch 'aaargh' of https://github.com/70000hp/Hbm-s-Nuclear-Tech-GIT into aaargh 2024-04-21 11:36:42 -04:00
70000hp
c6eba58fa6 hopefully a serverside crash fix 2024-04-21 11:02:54 -04:00
Bob
13aaa627b2 bronze 2024-04-20 23:41:49 +02:00
Bob
9eaeddca32 that oughta do it 2024-04-20 17:30:33 +02:00
Boblet
d7664c79da power net: compromise edition 2024-04-19 15:21:43 +02:00
Boblet
3460e8dcef and some more fixes 2024-04-18 14:56:08 +02:00
HbmMods
d25a350efa
Merge pull request #1445 from MellowArpeggiation/angelica
Replace DisplayLists with VBOs (Improved Angelica support)
2024-04-18 10:47:58 +02:00
George Paton
8d244baf12 Reduce visibility of VBOBufferData 2024-04-18 17:26:15 +10:00
George Paton
dc8ec31ccd Allow render distances greater than 16 with Angelica installed 2024-04-18 17:17:29 +10:00
George Paton
3c760ba95d Fix up door rendering, moving it to a more generic interface 2024-04-18 17:14:04 +10:00
George Paton
b9fa946440 Fix connected texture blocks not rendering 2024-04-18 16:05:22 +10:00
George Paton
24001a0ae8 Replace DisplayLists with VBOs!
Gotta fix the door rendering though, elided for now
2024-04-18 14:26:20 +10:00
Boblet
efa001ad28 sound engine bullshittery 2024-04-17 16:13:36 +02:00
Boblet
17a9d824aa some fixes, smeltable diamonds and emeralds 2024-04-17 11:32:41 +02:00
HbmMods
664dbd6657 Revert "Merge pull request #1429 from 70000hp/NHNEI-compat"
This reverts commit ef169ac06e51b73b0bb03f25044c07f424080257.
2024-04-17 10:14:36 +02:00
Boblet
5b41c3d83a paintable pylon wires 2024-04-16 14:54:06 +02:00
HbmMods
ef169ac06e
Merge pull request #1429 from 70000hp/NHNEI-compat
GTNH NEI Compat
2024-04-15 14:07:53 +02:00
HbmMods
99f1f6ab06
Merge pull request #1426 from MellowArpeggiation/qol
QoL changes
2024-04-15 14:05:00 +02:00
HbmMods
c0d48730a3
Merge pull request #1425 from 70000hp/yeag
Tweaks for glyphids
2024-04-15 14:02:57 +02:00
Boblet
673628bc02 just keep whacking it until it behaves 2024-04-15 13:30:23 +02:00
Bob
9206755363 kaboom 2024-04-14 21:23:28 +02:00
HbmMods
49e30bf1b0
Merge pull request #1433 from Doctor17-git/master
Updated ru_RU.lang
2024-04-14 17:20:29 +02:00
Bob
bed04f4311 plylons
bylons

plons
2024-04-14 17:18:57 +02:00
Doctor17-git
d106b0205e
Updated ru_RU.lang
updated russian localization
2024-04-14 18:15:26 +03:00
HbmMods
1f271f6b23
Merge pull request #1432 from HbmMods/TSPA
guess what TSPA stands for
2024-04-14 14:23:06 +02:00
Bob
0c111b159a DIE 2024-04-14 14:22:40 +02:00
Bob
e87984cc39 can we get this over with 2024-04-14 14:20:20 +02:00
Bob
8442ee4940 i hope i step on a landmine 2024-04-13 19:51:59 +02:00
Boblet
be3147c80d We must construct additional pylons!! 2024-04-12 13:45:42 +02:00
Boblet
9c7a96d867 CRUSHIN' CRUSHIN' (the second) 2024-04-12 09:42:23 +02:00
70000hp
c66bd21fcc my brain hurts 2024-04-11 18:45:30 -04:00
Bob
e5dffd3d2a NEITHER SNOW NOR RAIN NOR THE GLOOM OF NIGHT 2024-04-11 21:58:47 +02:00
Boblet
c16818c15d i can hear satan's voice, he's telling me to invest in apple.
what does this mean? why does he want me to buy apples??
2024-04-11 16:08:04 +02:00
Boblet
ba58f42ef2 I will kill Horse Ronald Reagan when I become 23 years old 2024-04-10 16:10:55 +02:00
George Paton
879ce28ad9 Allow infinite fluid barrels to fill pressurized tanks 2024-04-10 10:59:15 +10:00
George Paton
93f03208fa Modify GUIs for existing machines that require compressors 2024-04-10 10:21:33 +10:00
George Paton
76ca5c0a93 Prevent players skipping fluid pressurization by just chucking fluid container into machines 2024-04-10 09:29:29 +10:00
Bob
b661b89334 SISTOR! DID YOU USE ALL MY DIAMONDS TO MAKE JUKEBOXES?
yeag
2024-04-09 20:57:33 +02:00
Boblet
c9c6549340 everything is falling the fuck apart 2024-04-09 16:55:53 +02:00
Bob
b1e2fbbbbc congress should pass a bill barring me from using a PC ever again 2024-04-08 20:44:48 +02:00
Boblet
a9c6405f41 project mkultra 2024-04-08 16:44:48 +02:00
George Paton
0b8332d525 Play full counts if the player also has a regular counter 2024-04-07 17:23:59 +10:00
George Paton
180234e245 Integrated geiger counters now generate audio based on dosage AFTER protection 2024-04-07 16:39:33 +10:00
George Paton
0146e82866 Change structure/dungeon configs to be trinary (true|false|flag) 2024-04-07 13:41:48 +10:00
George Paton
30969b281f Automatically focus search box in Multi Fluid Identifier 2024-04-07 11:40:13 +10:00
70000hp
acd2e96c64 minor behemoth buff 2024-04-06 13:34:44 -04:00
70000hp
ebeb276e94 some more stuffs 2024-04-06 10:15:54 -04:00
Boblet
1618d9be12 enough for today, my head hurts 2024-04-05 14:51:36 +02:00
70000hp
319ab19e01 the ferocious leapers 2024-04-04 19:32:03 -04:00
Bob
3cb6e855a8 # WE ARE SO FUCKING BACK 2024-04-04 19:35:03 +02:00
70000hp
fb765174dd moremore light logic 2024-04-03 17:42:10 -04:00
Boblet
7ab30aa136 Do you know what this means? It means that
this damn thing doesn't work at all!
2024-04-03 14:48:50 +02:00
Boblet
7b6467fb37 my head hurts 2024-04-02 14:41:26 +02:00
HbmMods
2519ac3943
Merge pull request #1416 from MellowArpeggiation/wiki
Inventory item rendering for Wiki
2024-04-02 08:05:38 +02:00
HbmMods
4cd53def61
Merge pull request #1415 from 70000hp/augh
bob i swear to god
2024-04-02 08:03:48 +02:00
HbmMods
38a3e11167
Merge pull request #1417 from CM436/master
Fixed steam particles config option
2024-04-02 08:03:29 +02:00
CM436
f4ba0ce7e4 fixed cooling tower config option 2024-04-01 20:16:23 -06:00
George Paton
4e416f18b6 Correctly remove escape sequences from parsed names 2024-04-02 09:56:19 +11:00
70000hp
d844e7ff2a bob i swear to god 2024-04-01 18:44:22 -04:00
Bob
43d3d03df5 nodespace bullshit 2024-04-01 20:56:19 +02:00
George Paton
a259ba716f Include subitems too, with rules for items like RBMK pellets
Ignore unlocalized items
2024-04-01 20:36:30 +11:00
George Paton
6c8677f2c7 Press CTRL+0+1 to fart and sneeze simultaneously 2024-04-01 15:23:51 +11:00
Bob
2bb43e5136 god i love huffing gasoline 2024-03-31 22:49:18 +02:00
HbmMods
6f91612282
Merge pull request #1409 from 70000hp/tiny-beb-pr
Slag tap Improvements, Channel speedup, and caster fixes
2024-03-31 22:01:18 +02:00
HbmMods
1893aab49c
Merge pull request #1407 from CM436/master
Config option to disable cooling tower particle emissions
2024-03-31 22:00:30 +02:00
Bob
f904636517 we're in a rush now 2024-03-31 21:55:59 +02:00
Bob
62d6408558 the shell re-shellening 2024-03-30 22:05:46 +01:00
70000hp
21495449e0 Channel and caster tweaks 2024-03-30 14:11:53 -04:00
70000hp
5fd71bdca4 yeag 2024-03-29 20:07:09 -04:00
CM436
b28d34d554 fix indentation
once again some random minor thing got changed by accident
2024-03-29 11:19:45 -06:00
CM436
20499eb80e remove a single character
most useless change ever but i'm new to this stuff and overly cautious of fucking things up
2024-03-28 11:17:52 -06:00
CM436
f1b444bac9 Revert "added whitespace"
This reverts commit 628a9474acf831ec7f1148b1fc6b49637a5cb700.
2024-03-28 11:12:13 -06:00
CM436
628a9474ac added whitespace
why not
2024-03-28 11:03:47 -06:00
CM436
f4c0ed3f4c removed one line of code
intellij added this thing and i have no clue what it does, removing it doesn't break anything
2024-03-28 10:58:18 -06:00
CM436
e6bfea837a config option for cooling tower particles
added a config option to disable the particles emitted by cooling towers when on "all" or "decreased" particle settings
2024-03-27 16:16:47 -06:00
Bob
71cdc4c788 FUCK 2024-03-25 21:10:20 +01:00
Boblet
7be71dfb99 fixes, foxes, flixes 2024-03-25 14:38:29 +01:00
Bob
bc65f80501 removed more useless crap 2024-03-24 18:26:21 +01:00
HbmMods
4b61cb4cc8
Merge pull request #1395 from Vaern/master
shift clicking 2.0
2024-03-24 11:42:11 +01:00
Vaern
d71fa93ab7 argh 2024-03-23 16:04:56 -07:00
Bob
1b24a1d860 power net crap 2024-03-23 23:04:30 +01:00
Boblet
2c1c56a037 more cleanup, configs 2024-03-22 15:09:21 +01:00
Bob
4869dbb1c8 my eyes are burning 2024-03-21 21:58:49 +01:00
Boblet
3f3d7551d5 better wire rendering, sat miner loot pool configs 2024-03-21 16:52:15 +01:00
Bob
b65abb526f i can taste colors 2024-03-20 21:07:13 +01:00
Boblet
33e6237377 finished item pool config implementation 2024-03-20 16:46:05 +01:00
Bob
d0e90250c5 loot pool config system 2024-03-19 21:20:53 +01:00
HbmMods
2d8c9d5481
Merge pull request #1392 from MellowArpeggiation/hardon
Add Particle Accelerator presentations
2024-03-19 16:05:33 +01:00
George Paton
df7808b48e Add presentation for the Schottky Particle Diode 2024-03-19 18:14:53 +11:00
HbmMods
5f1fe3fa87
Merge pull request #1391 from Vaern/master
Fixed Hadron Coolers
2024-03-19 08:02:11 +01:00
Vaern
e95adcac3f added coolers to valid plating blocks 2024-03-18 21:51:37 -07:00
George Paton
d65469e1c0 Finish building the whole accelerator in the presentation! (fucking hell) 2024-03-19 15:03:49 +11:00
George Paton
cac7aa6705 Fix diode reentry behaviour being wonky due to shallow history copy
Fix diode error handling, will always fail if a particle can't leave a diode
2024-03-19 11:51:40 +11:00
Vaern
ffcce93fba Fixed coolers 2024-03-18 16:54:18 -07:00
Boblet
b733dfc25e fixed F1 in NEI 2024-03-18 15:29:18 +01:00
George Paton
67fbcfd3c2 Add fourth scene and convert indentation to tabs 2024-03-19 00:44:41 +11:00
George Paton
7f2411c216 Add how2hadron presentation scenes 1-3 2024-03-18 23:44:17 +11:00
HbmMods
5f2606c65e
Merge pull request #1387 from MellowArpeggiation/hardon
Quantum virtual particles
2024-03-18 11:17:26 +01:00
Boblet
a514e9863e fixes 2024-03-18 11:07:46 +01:00
Bob
9cf673206a flash! bam! alakazam! 2024-03-17 17:31:50 +01:00
George Paton
3a611feff1 Ensure particles only travel through a given schottky direction ONCE. Also code cleanup 2024-03-17 16:47:31 +11:00
George Paton
4859904e6c If ANY coils fail, it'll now throw an error and not process the particle, even if there is a valid route. This should make it easier to diagnose errors 2024-03-17 15:33:04 +11:00
George Paton
942a05fea7 Only pop the first analysis particle 2024-03-17 15:20:08 +11:00
George Paton
5ea0cae74c Create virtual particles at each schottky for each valid exit, collapse the cheapest valid particle after analysis 2024-03-17 14:52:25 +11:00
George Paton
e249cb5fe8 fix fog distance to work with longer render distances
fix fog being cached when unnecessary
2024-03-16 16:41:59 +11:00
Boblet
2a9ee72cc4 axe tweaks 2024-03-15 15:22:19 +01:00
HbmMods
38fa0e6116
Merge pull request #1385 from burningwater202/master
It was an Axe-dent I swear
2024-03-15 08:13:58 +01:00
HbmMods
8b0eb4daa2
Merge pull request #1378 from Kal19801/master
Update zh_CN.lang
2024-03-15 07:57:31 +01:00
Bob
f52e46e001 bigass shoe lol 2024-03-14 22:24:22 +01:00
burningwater202
7ce891689a Axe yourself this
fixes Mese pickaxe damage that I for some reason modified
2024-03-14 17:05:23 -04:00
burningwater202
68f08fd6f3 Merge branch 'master' of https://github.com/burningwater202/Hbm-s-Nuclear-Tech-GIT 2024-03-14 17:02:04 -04:00
burningwater202
7d50f934eb Lemme axe you somethin
sorry for being a pain in the axe
Adds Super Axes
(Bismuth, Molten, Chlorophyte, Mese)

Basically the same as the pickaxes but they also double as a weapon, with each having damage relatively respective to the progression level equivalent meteorite sword.
2024-03-14 16:59:44 -04:00
Boblet
866676f6f0 cleanup 2024-03-14 16:28:57 +01:00
Boblet
b15447d6eb done shit, compressor fix, some preparation 2024-03-13 16:24:46 +01:00
Boblet
7429327034 making use of the pollution tag 2024-03-12 16:32:54 +01:00
HbmMods
b38584862a
Merge pull request #1381 from Vaern/master
fixed comparator output for pile fuel
2024-03-12 08:10:39 +01:00
Vaern
14153601ee
fixed comparator output for pile fuel 2024-03-11 12:47:08 -07:00
Boblet
3e716bf3fc cap blocks with meta, customizable bedrock ores 2024-03-11 16:20:32 +01:00
Kal_1024
8a64b4a530
Update zh_CN.lang 2024-03-11 17:50:13 +08:00
Bob
bc3a3ef2a2 these changes are like 2 days old and i forgot what i even did 2024-03-10 22:26:48 +01:00
Kal_1024
ec666f1ba6
Update zh_CN.lang 2024-03-08 22:17:27 +08:00
Boblet
c529f034bf small fixes 2024-03-08 15:14:45 +01:00
Kal_1024
c6960f3838
Update zh_CN.lang 2024-03-07 19:41:30 +08:00
Kal_1024
57fb013e9c
Update zh_CN.lang 2024-03-07 18:51:58 +08:00
Boblet
c943eb62a3 NEEEEEAAAAR, FAAAAAAR, WHEREEEEEEEEEEEVER YOU AAAAAARE
I BELIIIIEEEEEVE THAT MY HEART WILL, GO OOOOOOO-OOOOOON
2024-03-06 16:06:18 +01:00
Boblet
0128164deb wartec compatibility 2024-03-06 10:34:45 +01:00
Kal_1024
4e4c603a75
Update zh_CN.lang 2024-03-06 16:12:06 +08:00
Bob
98115ac784 i forgor 2024-03-05 21:41:56 +01:00
Boblet
9f422f690a recipes 2024-03-05 16:56:40 +01:00
HbmMods
07605db26b
Merge pull request #1373 from Vaern/master
extremely minor silo change and minor fix
2024-03-05 07:48:33 +01:00
Vaern
3239d76989 minor change and minor fix 2024-03-04 18:44:43 -08:00
Bob
201ff3cbdd some vague bullshit about hopeville 2024-03-04 22:09:23 +01:00
HbmMods
79b08d8cdc
Merge pull request #1369 from Vaern/master
Revamped Silo Structure
2024-03-04 21:09:55 +01:00
Bob
08812a700e the malicious gigglefish from the silly dimension 2024-03-04 21:08:31 +01:00
Boblet
23e58c7e1d 0000000000 2024-03-04 16:44:34 +01:00
Vaern
a5e9546a56 Merge remote-tracking branch 'HbmMods/master' 2024-03-03 10:33:07 -08:00
Vaern
bae1ce5f1d ready for pr 2024-03-03 10:32:41 -08:00
Vaern
c0e39e1467 yeah that's about done 2024-03-02 20:40:21 -08:00
Vaern
6cbfdce876 Added deco, RTTY 2024-03-02 18:16:04 -08:00
Vaern
bccb887a9d air filling for everything 2024-03-02 14:56:18 -08:00
Bob
ec389b72f9 crap 2024-03-02 23:26:40 +01:00
Vaern
7934dba1d2 walling, floors, doors, ceilings, and arches for everything 2024-03-02 12:49:13 -08:00
Vaern
ebe3dea091 silo floors, railings, stairs + blue room beginnings 2024-03-01 22:03:15 -08:00
Vaern
0bbc9a09ed Merge remote-tracking branch 'HbmMods/master' 2024-03-01 16:05:44 -08:00
Boblet
b2b0c79bb9 missing star control pieces, snowglobes, broken turret 2024-03-01 15:06:39 +01:00
Vaern
e30e1b2ede beginnings 2024-02-29 20:45:20 -08:00
Bob
047c25aa4e cheap plastic models made in china 2024-02-29 21:24:34 +01:00
Bob
0c8ee5aa19 toasters, crappy screens 2024-02-28 21:01:07 +01:00
Boblet
f43456b459 more fluid trait crap 2024-02-27 16:54:11 +01:00
Bob
5f02b92a31 fuck it whatever 2024-02-26 21:30:50 +01:00
HbmMods
3e2bf3df76
Merge pull request #1361 from MellowArpeggiation/congo
Congo weapon animations
2024-02-26 07:59:41 +01:00
George Paton
9a93570086 Actually, it looks way better to cycle empty than to wait until the chamber is cleared by reloading (especially since the spent casing doesn't reflect the difference!) 2024-02-26 15:03:33 +11:00
George Paton
7d6bca6d67 Trigger a fog update every 3 seconds at maximum, fixing fog colour not blending when standing still 2024-02-26 14:24:00 +11:00
George Paton
836e8156c6 whoops, used the old exporter and missed a few CONSTANT keyframes, causing the shells to clip through the barrel on firing 2024-02-26 14:16:42 +11:00
George Paton
b710c6d6f6 Add empty firing animation and case colours 2024-02-26 12:12:47 +11:00
HbmMods
5bfa4995c5
Merge pull request #1358 from Vaern/master
Fixed Electric Furnace Shift-Clicking
2024-02-25 11:46:54 +01:00
George Paton
e88d3aba19 Add animations to Congo Lake 2024-02-25 17:59:07 +11:00
Vaern
90a66ebfdb Fixed cent, acidizer, arc furnace & welder shift clicks 2024-02-24 10:49:50 -08:00
Vaern
1be60d718f 'ate unused imports 2024-02-23 15:51:02 -08:00
Vaern
170bbf165e plop 2024-02-23 15:47:18 -08:00
HbmMods
14fb890dd7
Merge pull request #1356 from MellowArpeggiation/boble
Add Mellow bobblehead
2024-02-23 14:32:18 +01:00
George Paton
e20c5ddd04 Add Mellow bobblehead 2024-02-23 23:48:39 +11:00
Boblet
933d45faba localization for custom machines 2024-02-23 09:07:55 +01:00
HbmMods
8f840f5145
Merge pull request #1353 from MellowArpeggiation/master
Fix spotlight beams crashing in nuclear explosions
2024-02-23 08:27:40 +01:00
George Paton
5d63b80777 Fix spotlight beams crashing in nuclear explosions
Fix nuclear fallout depositing in midair on top of beams
2024-02-23 15:47:00 +11:00
Boblet
c19c8ac4f4 the yapping never ends 2024-02-22 16:52:38 +01:00
HbmMods
8c34b0f02f
Merge pull request #1350 from MellowArpeggiation/master
Fix fog colour getting stuck on fast graphics
2024-02-22 08:59:10 +01:00
George Paton
0de2a752bc Fix fog colour sticking on fast graphics 2024-02-22 18:56:09 +11:00
Boblet
b30bb8ae15 last bit of EC compat stuff 2024-02-21 16:31:34 +01:00
HbmMods
4588db50af
Merge pull request #1349 from BallOfEnergy1/OC_bugfix
small bug fix
2024-02-21 09:53:15 +01:00
Boblet
b63f029105 assembler config now uses the new system 2024-02-21 09:52:42 +01:00
BallOfEnergy
0b79e3c29a oops useless imports 2024-02-20 20:12:50 -06:00
BallOfEnergy
5ce1b997b3 small bug fix 2024-02-20 20:03:45 -06:00
Boblet
315bb8d449 whatever 2024-02-20 16:26:13 +01:00
HbmMods
0c71bb1a42
Merge pull request #1348 from Kal19801/master
Update zh_CN.lang
2024-02-20 08:34:59 +01:00
HbmMods
816c918000
Merge pull request #1347 from MellowArpeggiation/benelli
Benelli animations (and drum model)
2024-02-20 08:34:48 +01:00
HbmMods
17adce20bc
Merge pull request #1346 from MellowArpeggiation/master
Improve SSG animations
2024-02-20 08:34:06 +01:00
Kal19801
7a4799939d
Update zh_CN.lang 2024-02-20 14:22:03 +08:00
George Paton
f5d1b7b787 Add empty reload sounds to Benelli 2024-02-20 13:41:09 +11:00
George Paton
8408a8e239 benelli my beloved wife, smite this unholy glyphid scum 2024-02-20 13:14:13 +11:00
George Paton
5fce05e5ce Actually add the config option (here is the olive branch. Love ya, even if yer a dingbat) 2024-02-20 10:11:15 +11:00
George Paton
ff713d10bd Improve SSG animations 2024-02-20 09:42:38 +11:00
Boblet
211028b4ef we don't version bump, we version punch you in the dick 2024-02-19 15:57:50 +01:00
HbmMods
8bb2a2758b
Merge pull request #1345 from Kal19801/master
Update zh_CN.lang
2024-02-19 15:56:31 +01:00
Boblet
79d57071b7 fixes, flixes and foxes 2024-02-19 15:55:48 +01:00
Kal19801
efc9220b45
Update zh_CN.lang 2024-02-19 21:59:36 +08:00
HbmMods
8d86ebb857
Merge pull request #1344 from MellowArpeggiation/master
Fix centered weapons erroneously gaining the ADS accuracy boost
2024-02-19 07:57:43 +01:00
George Paton
d4203f0334 Fix centered weapons erroneously gaining the ADS accuracy boost 2024-02-19 10:54:44 +11:00
Bob
cc5371a761 no more instant loading 2024-02-18 21:13:15 +01:00
HbmMods
358722c195
Merge pull request #1342 from Doctor17-git/master
Updated ru_RU.lang
2024-02-18 18:25:16 +01:00
Doctor17-git
726d277829
Updated ru_RU.lang
updated russian localization
2024-02-18 20:24:05 +03:00
Bob
b922c79b35 and then this 2024-02-18 18:22:10 +01:00
HbmMods
1811a41fd5
Merge pull request #1340 from MellowArpeggiation/master
Old-school Super Shotgun animations
2024-02-18 17:55:02 +01:00
Bob
7ad017ec8e eeeeeeee macarena! 2024-02-18 17:52:42 +01:00
George Paton
6d14bbb10b Another small bugfix in reference implementation, it would try to add unsupported lerp types 2024-02-18 20:01:53 +11:00
George Paton
b787040e33 oops forgot to update the Blender reference implementation 2024-02-18 17:53:37 +11:00
George Paton
be17321013
Merge branch 'HbmMods:master' into master 2024-02-18 17:29:31 +11:00
George Paton
d08d503178 Added old-school animations for the super shotgun, including new CONSTANT keyframe loading 2024-02-18 17:28:53 +11:00
Bob
65cda2b65b almost forgot about this one 2024-02-16 22:07:17 +01:00
Boblet
efa790fe75 life extender rework, more EC compat 2024-02-16 15:01:25 +01:00
Bob
c77d10cde4 bedrock ores, more launch pad textures 2024-02-15 21:44:59 +01:00
Boblet
675838eec7 more energy control compat stuff 2024-02-15 16:10:53 +01:00
Bob
ca2505dad0 launch pad textures, silo launch pad 2024-02-14 21:29:08 +01:00
Boblet
786ced191b launch pad condensation for LOXY rockets 2024-02-14 15:38:25 +01:00
George Paton
9ff31388c8 Make worldgen mines be inactive until a player comes within 25 blocks, this has two effects:
* Far away worldgen mines won't be triggered by mobs
* You can hear an activation beep (once), giving you an indication of their existence
2024-02-14 17:21:07 +11:00
Bob
82ec052d27 launch pad GUI, crash fix 2024-02-13 20:37:44 +01:00
Boblet
fa06d83b4b some preparation 2024-02-13 16:53:25 +01:00
Boblet
daaf50efd4 the malicious gigglefish from the silly dimension 2024-02-13 14:01:01 +01:00
Bob
e2807f0721 girthier meatier more sensual missiles 2024-02-12 21:18:37 +01:00
Boblet
6f00c68051 tweaks, recipes, hydrotreater texture 2024-02-12 16:49:47 +01:00
Doctor17-git
37dd5836c6
Updated ru_RU.lang
h2
2024-02-12 15:44:19 +03:00
Boblet
6ca2fc463a let's see if this does anything 2024-02-12 10:10:53 +01:00
Boblet
a6ccd25119 tritium lamps now have a shoddy light beam implementation too
more cargo cult behavior
2024-02-12 08:53:50 +01:00
HbmMods
d9a6788299
Merge pull request #1335 from MellowArpeggiation/spotlight
Industrial lighting
2024-02-12 08:03:31 +01:00
HbmMods
4637581a71
Merge pull request #1334 from MartinTheDragon/master
Make fallout perimeters more interesting
2024-02-12 07:52:36 +01:00
HbmMods
674855ea4d
Merge pull request #1329 from fedoraman737/pr1266
Update TileEntityReactorResearch.java - Bug Fix
2024-02-12 07:51:25 +01:00
George Paton
3338e86d57 Add English localisation 2024-02-12 17:40:21 +11:00
George Paton
8790e4fa3f Add off variations to lights, activated by applying power (like redstone torches) 2024-02-12 17:28:07 +11:00
George Paton
58ec00004c Render the blocks in the inventory correctly
Add crafting recipes for the three light types
2024-02-12 16:14:05 +11:00
George Paton
f9826d8f3f Add the final three types of light, with models and texturing 2024-02-12 15:37:33 +11:00
MartinTheDragon
787549f9d7
Make fallout perimeters more interesting 2024-02-11 23:13:09 +01:00
HbmMods
ab4c14e3f4
Merge pull request #1333 from Vaern/structure-2
RuralHouse Structure
2024-02-11 22:20:11 +01:00
Vaern
81de047825 fixes 2024-02-11 13:11:34 -08:00
Vaern
7f689bfc37 minor changes, mapgen 2024-02-11 13:06:05 -08:00
Bob
9e58492165 yeah sure why not 2024-02-11 20:58:32 +01:00
Bob
a57a284d1c why didn't it do that to begin with? 2024-02-11 20:47:34 +01:00
Bob
2c6d5f9fde launch pads yeah 2024-02-11 19:46:04 +01:00
Vaern
b39eb2a52b reworksing furniture 2024-02-10 17:52:40 -08:00
Bob
330ca6bc86 the final UV 2024-02-10 18:11:49 +01:00
Vaern
8d0faf7192 fixes 2024-02-09 23:40:51 -08:00
Vaern
1bd5efe0a7 added rural house, few additions
don't think i've ever needed the pattern tool but at least it works now
2024-02-09 23:19:34 -08:00
Boblet
2eb3247d67 first batch of Energy Control compat code 2024-02-09 14:44:44 +01:00
Bob
35e9fc0c7d more missile UV 2024-02-08 21:30:49 +01:00
Boblet
8878b3f9de arty sync fix 2024-02-08 16:28:12 +01:00
George Paton
a95079826c you forgot beam cutting ya ding dong 2024-02-08 18:12:00 +11:00
George Paton
88a90aada7 Add new Spotlight block type, spawns SpotlightBeam blocks away from the wall that it is placed on 2024-02-08 18:01:59 +11:00
fedoraman737
760d7e9456
Update TileEntityReactorResearch.java
Updated line 435 -  last argument in clamp_double changed to 1.0
2024-02-07 22:40:45 -06:00
Bob
e5f2ae6860 half a UV because i spent all day playing fucking infinitecraft 2024-02-07 21:34:18 +01:00
Boblet
a8acfafebf polluting fluid trait, more oil work 2024-02-07 16:44:07 +01:00
George Paton
2c6fa42bf0 Fucking murder the sound loop, this way it'll call .stop() every update until it is disposed 2024-02-07 13:48:18 +11:00
Vaern
86c738532d Merge remote-tracking branch 'HbmMods/master' into structure-2 2024-02-06 16:07:01 -08:00
Bob
7a1a3de63f some UV 2024-02-06 21:21:59 +01:00
Boblet
0de7b319bb oil oil oil oil oil 2024-02-06 16:07:13 +01:00
HbmMods
443e154e57
Merge pull request #1326 from MellowArpeggiation/siphon
Add fluid siphon
2024-02-06 08:10:35 +01:00
George Paton
72a252194a Add a new "unsiphonable" fluid trait instead of using a static list 2024-02-06 18:07:21 +11:00
George Paton
05a087bce4 you know what *unsiphons your water* 2024-02-06 17:40:51 +11:00
George Paton
bcb8a48620 you know what *siphons your gas* 2024-02-06 14:52:06 +11:00
Boblet
bc0c64e27f desulfurized oils 2024-02-05 16:45:29 +01:00
HbmMods
08105fea5f
Merge pull request #1319 from Kal19801/master
Update zh_CN.lang
2024-02-05 09:34:11 +01:00
Bob
26db2c7076 ribbed for her pleasure 2024-02-04 01:36:26 +01:00
HbmMods
217ce07e6c
Merge pull request #1324 from MellowArpeggiation/master
SPAS-12 animations (and a few bugfixes)
2024-02-03 12:01:01 +01:00
HbmMods
77e0fe5338
Merge pull request #1325 from Doctor17-git/master
Updated ru_RU.lang
2024-02-03 11:59:17 +01:00
Doctor17-git
662c81b26f
h2 2024-02-03 11:10:47 +03:00
Doctor17-git
a1208f6ebd
h 2024-02-03 10:44:54 +03:00
Doctor17-git
1b21c87daf
Updated ru_RU.lang
updated russian localization
2024-02-03 10:11:50 +03:00
Boblet
dcad1001d2 missile stuff 2024-02-02 14:59:02 +01:00
George Paton
25e01b3742
Merge branch 'HbmMods:master' into master 2024-02-02 16:52:17 +11:00
George Paton
dc653d485e Add alt-fire sound to SPAS-12, and adjust animation to fit 2024-02-02 16:30:06 +11:00
Bob
ae24f4cbef this fucking sucks 2024-02-01 21:37:57 +01:00
Boblet
9965ada88f ough 2024-02-01 16:54:12 +01:00
George Paton
b1d7dc1738 Why not fix up the audio while I'm eeeere 2024-02-01 22:07:54 +11:00
George Paton
1de796fec5 Add animations to SPAS-12 2024-02-01 21:56:51 +11:00
George Paton
3d6c2aa67e Fix reload animation getting stuck if you run out of ammo before filling the weapon
Fix ALT_CYCLE support, will fall back to CYCLE if no ALT_CYCLE animation is defined
2024-02-01 21:56:04 +11:00
Kal19801
07a7a46269
Update zh_CN.lang 2024-02-01 16:45:44 +08:00
Kal19801
5adcecfb78
Update zh_CN.lang 2024-02-01 14:07:07 +08:00
George Paton
273018a5c7 Add correct shell colouring to KS23 2024-02-01 12:07:04 +11:00
Kal19801
11e1dd7e08
Update zh_CN.lang 2024-02-01 01:54:19 +08:00
Kal19801
fb1660b74d
Update zh_CN.lang 2024-02-01 01:19:48 +08:00
Boblet
1b1682a9d6 mind the GUI 2024-01-31 17:01:13 +01:00
Kal19801
24a60d6740
Update zh_CN.lang 2024-01-31 19:44:49 +08:00
HbmMods
85ba8dd587
Merge pull request #1288 from FOlkvangrField/more-custom-machine-options
More custom machine options
2024-01-31 09:25:03 +01:00
Kal19801
735a115bcd
Update zh_CN.lang 2024-01-31 16:20:27 +08:00
HbmMods
df5eef4182
Merge pull request #1318 from MellowArpeggiation/animation-rework
Weapon animation rework
2024-01-31 08:18:50 +01:00
George Paton
d979fd2e09 Add support for shotgun reloading animations
Add support for alternate reload animations when loading from completely empty
Add animations for Samuel The Big Fucking Shotgun
2024-01-31 17:11:03 +11:00
George Paton
67c4273ebf Add offsets to file format, so sequential animations don't have fucky offsets 2024-01-31 12:08:50 +11:00
George Paton
a5ad9c8f5a Scrap the reload animation on the novac 2024-01-31 09:51:51 +11:00
FOlkvangrField
3638ad475b Compatibility with old configs
Add compatibility with old configs. If the newly added option is not read, it will be automatically written to the default value.
2024-01-30 21:59:01 +08:00
George Paton
2faf317e0d silly duffer moment 2024-01-30 20:55:04 +11:00
George Paton
0a7f0a3b9c Merge branch 'master' into animation-rework 2024-01-30 20:35:45 +11:00
George Paton
a2e487912c Initial animation work for the Novac 2024-01-30 20:33:28 +11:00
George Paton
60de291033 Add animations to Cursed 357 2024-01-30 19:12:52 +11:00
George Paton
41759d096d Add note to use YZX rotation mode in Blender 2024-01-30 18:42:55 +11:00
George Paton
bad30204cf Update ntm-animator to include an importer 2024-01-30 17:09:03 +11:00
George Paton
a067e437a5 New animation loader! COLLADA supports all the cool things we want to do, but nothing that _implements_ COLLADA as an exporter does... aint that grand
Animation set for Colt/Python added
2024-01-30 14:00:14 +11:00
George Paton
37490f35a2 A more reliable fix to the door audio issue 2024-01-30 13:45:08 +11:00
Boblet
041b768eda brick by brick, suck my 2024-01-29 09:24:25 +01:00
Bob
67980608ac oops 2024-01-28 21:37:40 +01:00
Bob
a43f2db51a return of chlorocalcite, cracked key 2024-01-27 17:44:15 +01:00
Boblet
174c7271a9 shit i really want in my survival world 2024-01-26 13:37:16 +01:00
Boblet
ff3e3727c3 small tweaks, radar screen fix 2024-01-25 15:48:24 +01:00
Boblet
24d763d75a food rebalance, MRE 2024-01-24 15:27:04 +01:00
Boblet
94a1c19640 i fell on a vietcong punji stick and now i am paraplegic 2024-01-24 14:48:18 +01:00
HbmMods
26b5c98ac4
Merge pull request #1306 from 245tt/qol
Thingamabob
2024-01-24 09:34:47 +01:00
HbmMods
c1625f3272
Merge pull request #1310 from MellowArpeggiation/master
Add missing audio and fix door loop audio
2024-01-24 09:34:04 +01:00
George Paton
5a7367624f Implement new animation system - is backwards compatible with old animations, since they only use the first 3 values, which are ultimately output identically 2024-01-24 16:12:15 +11:00
George Paton
b5b3131d04 Fix door audio issue where the open/close loop would sometimes play endlessly due to being dereferenced without being stopped 2024-01-23 21:01:05 +11:00
George Paton
07610a603d Added audio to Hephaestus (this machine is cool as fuck how did I not know about it before) 2024-01-23 19:26:48 +11:00
George Paton
17b4c52707 Add audio to the Fusion Reactor, with spool up/down 2024-01-23 17:14:03 +11:00
George Paton
13afe67eb3 Add operating sounds to large and chungus turbines 2024-01-23 15:36:49 +11:00
Vaern
1f559e656e Merge remote-tracking branch 'HbmMods/master' into structure-2 2024-01-22 16:41:28 -08:00
Vaern
99372b478f lmoa 2024-01-22 16:41:25 -08:00
Bob
c6450d78b2 and all that 2024-01-22 21:05:09 +01:00
Boblet
a67faa99df muffler 2: the remufflering 2024-01-22 14:43:05 +01:00
245tt
3d345de4d5 the 2 2024-01-22 10:08:41 +01:00
245tt
e11087bee6 the 2024-01-22 00:01:27 +01:00
Bob
52825d9d9e the foxes have taken over, torex tweaks 2024-01-21 20:16:10 +01:00
Bob
aa8e492610 molysite, mud hole 2024-01-21 00:28:26 +01:00
Vaern
061c65ce18 Merge remote-tracking branch 'HbmMods/master' into structure-2 2024-01-20 14:01:31 -08:00
Boblet
a1c4ef8e04 why are there so many foxes, make it stop 2024-01-19 14:33:28 +01:00
HbmMods
7a36248002
Merge pull request #1302 from 70000hp/aaaaaaaaaaa
Fixing the caster duping bug
2024-01-19 11:15:23 +01:00
Boblet
a21955eefd silo hatch texture, door recipe changes 2024-01-19 11:14:25 +01:00
70000hp
801c2155c7 FUCK 2024-01-18 18:10:35 -05:00
70000hp
ab9a45689b Merge branch 'master' into aaaaaaaaaaa 2024-01-18 18:06:58 -05:00
70000hp
3b83ac077e Merge branch 'master' into roundtwo 2024-01-18 18:02:18 -05:00
70000hp
104e722db0 augh. 2024-01-18 17:59:05 -05:00
Bob
aa6d0708cd silo hatch 2024-01-18 21:37:22 +01:00
Bob
2d80856d5f more foxes, somehow 2024-01-17 18:51:54 +01:00
Boblet
6865f59519 small foxes 2024-01-16 15:51:24 +01:00
Boblet
197b2837fb CURSE OF RAH 𓎢𓅲𓂋𓋴𓅂 𓅱𓆑 𓂋𓄿𓉔 2024-01-16 07:42:34 +01:00
Bob
e62955f667 radar fixes 2024-01-15 19:53:35 +01:00
HbmMods
e01ce6676d
Merge pull request #1300 from Doctor17-git/master
Updated ru_RU.lang
2024-01-15 15:57:37 +01:00
Doctor17-git
7b6a9ffa60
h 2024-01-15 17:54:02 +03:00
Doctor17-git
873810965d
Updated ru_RU.lang
updated russian localization
2024-01-15 17:52:28 +03:00
Boblet
5618be2d63 missile rendering, fixes 2024-01-15 15:51:26 +01:00
Boblet
b76af3cffa cleaned up pipettes, chemplant loading change delay 2024-01-15 10:19:39 +01:00
HbmMods
da4160e89f
Merge pull request #1293 from BallOfEnergy1/New_master
Pipettes!
2024-01-15 09:37:56 +01:00
Boblet
fbd9347fb8 Fixes 2024-01-15 09:37:41 +01:00
Bob
4ad1dcea73 mushroom machine broke 2024-01-14 22:43:29 +01:00
Bob
413d14e263 fuck me with a rusty knife 2024-01-14 22:08:06 +01:00
BallOfEnergy
7c8830bd3d Merge remote-tracking branch 'origin/New_master' 2024-01-14 14:16:14 -06:00
BallOfEnergy
534daf7782 changed lab pipette from assembler to anvil, fixed rubber shit, should be done
(circuits are because its considered a "micropipette" and is therefore much more complex than a normal pipette.)
2024-01-14 14:15:46 -06:00
HbmMods
fcbd049fcf
Merge pull request #1299 from 70000hp/glyphid-tweaks
Glyphid tweaks
2024-01-14 21:10:08 +01:00
Vaern
13625e3019 Merge remote-tracking branch 'HbmMods/master' into structure-2 2024-01-14 11:42:38 -08:00
Bob
610685afe5 updated contributors list 2024-01-14 20:15:39 +01:00
Bob
6b885274a9 fixed strandcaster UV 2024-01-14 20:02:31 +01:00
HbmMods
9eb4cbe6c9
Merge pull request #1290 from 70000hp/caster-o'-strands
Strand Caster
2024-01-14 18:57:28 +01:00
Bob
32a658bd12 reda! 2024-01-14 18:56:25 +01:00
70000hp
3854161ac9 forgor 2024-01-14 12:11:21 -05:00
70000hp
c88ee74f7f flixes and tweaks 2024-01-13 08:07:40 -05:00
70000hp
87cf1c80c3 ouch. 2024-01-13 08:07:40 -05:00
70000hp
acf65b8922 minor scout tweak no.45 2024-01-13 08:07:40 -05:00
70000hp
a410efcf56 sgouts 2024-01-13 08:07:40 -05:00
70000hp
27d613e1c2 his name is jim, and he likes throwing rocks at people 2024-01-13 08:07:40 -05:00
Bob
9a955245cb preview render thing 2024-01-12 20:58:03 +01:00
BallOfEnergy
a64c4a2c38
Merge branch 'HbmMods:master' into New_master 2024-01-12 12:16:16 -06:00
Boblet
6b34f06324 faster chemplant ejector 2024-01-12 14:20:34 +01:00
Boblet
b548b90bb3 fixed the last recipes only using polymer 2024-01-12 10:12:46 +01:00
Bob
cd03edd52a guess what? even more removals! 2024-01-11 21:51:07 +01:00
Boblet
a647f93f15 incinerated old garbage 2024-01-11 16:35:55 +01:00
70000hp
ea0447dfaa coca cola, dont forget the ice!
fixed various strand caster problems
2024-01-10 18:13:46 -05:00
Bob
3dcf5a8e47 killed useless blocks, sellafite ores 2024-01-10 20:48:34 +01:00
Boblet
eb3c0ff9b1 fixes, radiation config for crater biome 2024-01-10 16:12:22 +01:00
Vaern
fafb70700c Merge remote-tracking branch 'HbmMods/master' into structure-2 2024-01-09 17:22:33 -08:00
Bob
abf0b858e6 sellafite variants, some torex tests 2024-01-09 21:45:46 +01:00
HbmMods
2feace3e71
Merge pull request #1289 from 9Valjew/master
The satellitening part 1
2024-01-09 13:43:45 +01:00
HbmMods
25e8893556
Merge branch 'master' into master 2024-01-09 13:43:39 +01:00
HbmMods
f5b6be1aa5
Merge pull request #1295 from Doctor17-git/master
Updated ru_RU.lang
2024-01-09 13:41:27 +01:00
Boblet
e3d167ff01 yeag 2024-01-09 13:08:15 +01:00
Doctor17-git
c2fb48cb59
Updated ru_RU.lang
updated russian localization
2024-01-09 13:15:07 +03:00
Vaern
6a8fa58f76 Merge remote-tracking branch 'HbmMods/master' 2024-01-08 18:54:59 -08:00
Bob
7e665932d1 crater biome test 2024-01-08 21:51:56 +01:00
Boblet
8dde233a5b i should kill myself 2024-01-08 16:46:39 +01:00
Bob
bc879f1bec can you like fuck off 2024-01-07 21:59:28 +01:00
Bob
cabcb65b1c yeah whatever 2024-01-07 21:11:56 +01:00
Bob
53c6c1ab77 mostly fixes, supply crate changes 2024-01-07 20:58:31 +01:00
Bob
4c3945c924 getting railed again 2024-01-06 22:59:40 +01:00
BallOfEnergy
67d0b833c7 swapping the sneaking control for changing capacity, seems more natural to shift to decrease. 2024-01-06 02:28:36 -06:00
BallOfEnergy
5fc297a7b1 2:15 am
forgive my terrible coding
2024-01-06 02:18:38 -06:00
BallOfEnergy
6739cde8f3
Merge branch 'HbmMods:master' into New_master 2024-01-05 19:02:50 -06:00
Bob
f254756c3d bolts, now with revolutionary gregtech compat 2024-01-05 23:33:11 +01:00
BallOfEnergy
56682e5c27
Small fix 2024-01-05 14:07:43 -06:00
BallOfEnergy
72fa1bda7f
raaagh 2024-01-05 16:30:30 +00:00
BallOfEnergy
0ab03d7b77
small flixes 2024-01-05 15:44:43 +00:00
BallOfEnergy
2b8c5f6851
Merge branch 'HbmMods:master' into New_master 2024-01-04 22:14:15 -06:00
BallOfEnergy
d44bc8c262 Merge remote-tracking branch 'origin/New_master' 2024-01-04 22:13:50 -06:00
BallOfEnergy
860d79a2d0 pipettes! 2024-01-04 22:13:40 -06:00
70000hp
6609851903
Merge branch 'master' into caster-o'-strands 2024-01-04 15:34:10 -05:00
70000hp
102f26c8d3 sweet baby ray's honey mustard
fixed boundingbox problems and a crash
2024-01-04 15:33:11 -05:00
Bob
b6ff9627af and now for some textures 2024-01-04 19:43:58 +01:00
Bob
59c5efd49b .44 but better 2024-01-04 14:24:03 +01:00
Bob
aad9fadda3 getting railed 2024-01-02 23:43:28 +01:00
Bob
9d6c7d6372 more rails, new gadget model 2024-01-01 22:33:12 +01:00
70000hp
9340287403 caster is finished, woo! 2023-12-31 22:47:35 -05:00
70000hp
b6f1d422e8 my workspace died again 2023-12-31 22:47:34 -05:00
70000hp
1505314260 caster o' strands, part deux 2023-12-31 22:47:32 -05:00
70000hp
9ad76d3bcc core strand caster stuffs 2023-12-31 22:47:32 -05:00
Bob
11f4b55a9d balls (reverb) 2023-12-30 22:43:37 +01:00
Bob
6594a80c70 coupled trains work again yay (please kill me) 2023-12-30 20:04:35 +01:00
9Valjews
65d6df3741 The satellitening part 1 2023-12-30 16:04:07 +02:00
FOlkvangrField
7473278dab More custom machine options
Add more custom machine options. Now custom machines can receive neutron flux and heat through the "Neutron Flux Receiver" and "Heat receiver" blocks within the structure. The recipe has also added corresponding configurable neutron flux and heat requirements, and can also be configured to generate/absorb contamination
2023-12-30 16:14:32 +08:00
HbmMods
c70d5bf517
Merge pull request #1267 from KoblizekXD/minor-features
FEL sound
2023-12-29 22:02:20 +01:00
HbmMods
6c0a8d10dc
Merge pull request #1266 from 9Valjew/master
Radar and Deathray linkage
2023-12-29 22:01:54 +01:00
HbmMods
e5fc5e64f0
Merge pull request #1280 from Voxelstice/fix-door-redstone
Fix inverted door redstone functionality
2023-12-29 22:00:42 +01:00
HbmMods
1e0ad1c52b
Merge pull request #1281 from Voxelstice/oc-two
Ported the 1.12.2 RBMK console OC compat to 1.7.10 and also more PWR compat
2023-12-29 22:00:02 +01:00
HbmMods
bc35e93777
Merge pull request #1285 from Doctor17-git/master
Updated ru_RU.lang
2023-12-29 21:59:00 +01:00
Bob
a7c3273b08 whatever garbage 2023-12-29 21:58:30 +01:00
Bob
8b4e4bf4f3 and now everything is broken 2023-12-27 17:59:28 +01:00
Bob
13debc2cab decimated rail rendering (we're so back) 2023-12-26 12:04:15 +01:00
Doctor17-git
13808fa5e7
Updated ru_RU.lang
updated russian localization
2023-12-25 10:38:39 +03:00
Bob
ca1cd3db17 and some more fixes 2023-12-25 00:08:26 +01:00
Bob
be2c17f102 can't wait for the silly people on discord bug me 24/7 about this fuckin
g commit i swear to god this is why we can't have nice things
2023-12-24 00:30:53 +01:00
Voxelstice
29264d206e insert something funny here 2023-12-21 14:11:01 +03:00
Boblet
f953d69ee6 spring cleaning 2023-12-20 16:40:22 +01:00
Voxelstice
6461a4c415 fix inverted door redstone 2023-12-19 21:30:20 +03:00
Boblet
65412f0c89 oop forgot to push this 2023-12-19 08:02:11 +01:00
Bob
c6d43a6215 model fix 2023-12-17 21:49:38 +01:00
Bob
0d2ab05316 some more shit idk 2023-12-17 19:42:52 +01:00
HbmMods
46a5f82e08
Merge pull request #1277 from HbmMods/pr1265
Pr1265
2023-12-17 17:44:20 +01:00
Bob
5af5c6c861 more shit to clean up 2023-12-17 17:42:42 +01:00
Bob
3416dbe14f fancier glyphid hives, maggots 2023-12-16 18:24:43 +01:00
Boblet
95520daebc moldy glyphids 2023-12-15 14:25:44 +01:00
Boblet
debfa0f3ee better spawner behavior, digger glyphid 2023-12-14 16:36:10 +01:00
Boblet
31c55c7cfa now i know how megan feels 2023-12-13 15:12:28 +01:00
Boblet
8a59eb9dbc initial cleanup 2023-12-13 11:08:01 +01:00
HbmMods
3d319a1b15
Merge pull request #1265 from 70000hp/just-kill-me-already
The Entire Glyphid Update
2023-12-13 10:09:53 +01:00
70000hp
4a72e201cf removed unused lang, removed No_Disperse 2023-12-11 18:58:34 -05:00
Bob
9448d51e02 fuck you 2023-12-10 21:15:53 +01:00
HbmMods
992bf1e929
Merge pull request #1269 from BallOfEnergy1/New_master
so sorry
2023-12-10 21:01:33 +01:00
BallOfEnergy
7dad773786 Merge remote-tracking branch 'origin/New_master'
# Conflicts:
#	changelog
2023-12-10 14:00:36 -06:00
BallOfEnergy
b6345644ed shit shit shit shit shit shit 2023-12-10 13:59:39 -06:00
HbmMods
0043a61933
Merge pull request #1268 from Doctor17-git/master
Updated ru_RU.lang
2023-12-10 20:33:20 +01:00
HbmMods
ebdd05ccde
Merge branch 'master' into master 2023-12-10 20:33:13 +01:00
Doctor17-git
c11dda67ad
Updated ru_RU.lang
updated russian localization
2023-12-10 22:28:06 +03:00
Bob
94484fe91e missing recipe 2023-12-10 20:12:36 +01:00
HbmMods
12badf2bdd
Merge pull request #1261 from BallOfEnergy1/New_master
OpenComputers Compatibility!
2023-12-10 19:00:53 +01:00
Bob
1d92906dd7 upgrade crap, funny new stamps 2023-12-10 18:58:26 +01:00
9Valjews
be31c070a5
Update ModItems.java
The unfuckening 2: now with readded foreign languages!
2023-12-10 10:34:02 +02:00
9Valjews
4343caeb22
Update en_US.lang
The unfuckening
2023-12-10 10:27:46 +02:00
9Valjews
c64f3f5e5a anyways I think it should be fine, its just my PC being stupid 2023-12-10 10:20:16 +02:00
9Valjews
0062a2f01c Empty commit, be aware, it might break some encoding shit in other languages, I cant check it because if I compile it it will use the hebrew encoding regardless, hopefully there would be no issue when its properly compiled as its only my system compiling it like that, rather than the files being borked 2023-12-10 10:18:52 +02:00
9Valjews
07af8a683f I suffer from stupid idiot disease 2023-12-10 10:07:09 +02:00
9Valjews
5cad503fa7 A way to link radars and orbital deathrays, works, I hate Hebrew encoding it makes every little file save a 50 minute task 2023-12-10 10:01:37 +02:00
70000hp
897308cb7f e 2023-12-08 19:57:50 -05:00
70000hp
ab9f5432a5 made the tasks comprehensible 2023-12-08 18:54:15 -05:00
KoblizekXD
cc4105fc68 certified fel sound 2023-12-08 11:53:00 +01:00
KoblizekXD
56e7d2d83c add non worky code 2023-12-08 11:15:08 +01:00
70000hp
0d33363eaf an unspeakably large commit
Contains the whole fucking glyphid PR. ill tell why later
2023-12-07 19:51:26 -05:00
Boblet
5c33fa1707 finished RBMK console, more upgrade stuff 2023-12-07 16:39:20 +01:00
Bob
8dc217b5f7 i ate poisoned grilled cheeses and now i am dying 2023-12-06 20:08:24 +01:00
Bob
b69351f857 that 2023-12-05 22:13:12 +01:00
Boblet
976e0dba37 decoy missile, recipe stuff 2023-12-05 16:39:03 +01:00
Bob
1157e691d7 more exposure chamber crap 2023-12-03 20:23:51 +01:00
Bob
f8e9cff64b tweaks, exposure chamber recipes 2023-12-02 20:44:34 +01:00
BallOfEnergy
67f0183dad Merge remote-tracking branch 'origin/New_master' 2023-11-30 19:26:54 -06:00
BallOfEnergy
7376e62112 PWR Compatibility fix (i forgot a line) 2023-11-30 19:26:44 -06:00
BallOfEnergy
0765584fda
Merge branch 'HbmMods:master' into New_master 2023-11-30 18:45:48 -06:00
BallOfEnergy
d4f8de4a54 Finishing touches. 2023-11-30 18:45:13 -06:00
Bob
ace7812d3f rubber dinghy fixes, missile recipe stuff 2023-11-30 22:10:41 +01:00
BallOfEnergy
b61d92a998
Merge branch 'HbmMods:master' into New_master 2023-11-30 14:21:49 -06:00
BallOfEnergy
f00839b222 Merge remote-tracking branch 'origin/New_master' 2023-11-30 14:19:32 -06:00
BallOfEnergy
d217cfb7f3 i fucking hate github
this is to fix everything that github just broke
including removing the shit from that one PR that broke everything
2023-11-30 14:18:03 -06:00
Boblet
30a5dee40d I'M ON A BOAT 2023-11-30 15:26:49 +01:00
BallOfEnergy
5a7cd85a6b
Merge branch 'HbmMods:master' into New_master 2023-11-29 18:48:08 -06:00
Boblet
57059d6a5e exposure chamber stuff 2023-11-29 15:46:08 +01:00
BallOfEnergy
ab9db6806c Revert "jesus fine 7 here's your fucking fast conveyors"
This reverts commit 0f47e9ace0e8da9f10b9d9458bcee36b528b8b2d.
2023-11-28 22:05:37 -06:00
BallOfEnergy
3a38c71c34 oh get ready for this one
huge commit
yes i should have spread it out but
im lazy :3
2023-11-28 22:05:26 -06:00
BallOfEnergy
42bf74c464 jesus fine 7 here's your fucking fast conveyors 2023-11-28 22:04:15 -06:00
BallOfEnergy
b000105392 attempt #2 2023-11-28 22:03:38 -06:00
BallOfEnergy
b0b37223a7 oh get ready for this one
huge commit
yes i should have spread it out but
im lazy :3
2023-11-28 22:03:12 -06:00
BallOfEnergy
b9f14fd471 Merge remote-tracking branch 'origin/New_master' into New_master
# Conflicts:
#	changelog
#	src/main/java/api/hbm/entity/IRadarDetectableNT.java
#	src/main/java/api/hbm/entity/RadarEntry.java
#	src/main/java/com/hbm/handler/CompatHandler.java
#	src/main/java/com/hbm/inventory/gui/GUIMachineRadarNT.java
#	src/main/java/com/hbm/packet/BufPacket.java
#	src/main/java/com/hbm/packet/PacketDispatcher.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadar.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadarNT.java
#	src/main/resources/assets/hbm/textures/gui/machine/gui_radar_nt.png
2023-11-28 21:56:20 -06:00
BallOfEnergy
c353334b21 bruh 2023-11-28 21:46:17 -06:00
BallOfEnergy
c86e52f5c0 pretty important fix where crane consoles would move 4x faster than possible 2023-11-28 21:46:17 -06:00
BallOfEnergy
533c87eb1a Large update to direct calls and limits for pulling values. 2023-11-28 21:46:15 -06:00
BallOfEnergy
dd5786bb60 Gas turbine compat!!! 2023-11-28 21:46:05 -06:00
BallOfEnergy
0f25aac3a2 back at it again with the OC compat
Now including:
Optimizations
Turbine Compat
Compat handler for general functions
other compat
2023-11-28 21:46:05 -06:00
sdddddf80
34865547c4 Transferred a bunch of text to lang file
Transferred a bunch of text to lang file(not all)
2023-11-28 21:46:04 -06:00
JameH2
6bc0a2de4a wow i cant believe you forgot these kill yours 2023-11-28 21:46:04 -06:00
JameH2
b311525574 ribbit 2023-11-28 21:46:04 -06:00
BallOfEnergy
42f7e7407b first commit on new shit 2023-11-28 21:46:04 -06:00
Boblet
8fac493947 post merge fixes, radar-launchable custom missiles, more stuff 2023-11-27 16:00:19 +01:00
KoblizekXD
f84696714a *sound* 2023-11-27 11:18:54 +01:00
KoblizekXD
4af44b880d fix: fix problematic sounds (minor skill issue) 2023-11-27 11:18:39 +01:00
KoblizekXD
862488d421 feat: add recipes for ass embler 2023-11-27 11:18:27 +01:00
KoblizekXD
d376f293be feat: add translations(pls work) 2023-11-27 11:18:17 +01:00
KoblizekXD
51ee74a418 feat: WE LOVE DOORS 2023-11-27 11:18:08 +01:00
KoblizekXD
0f082285cf feat: add secure access doors from 1.12.2 fork 2023-11-27 11:17:49 +01:00
Bob
cb0557170c small fix 2023-11-26 20:56:09 +01:00
HbmMods
d240b2ee8b Merge pull request #1254 from Doctor17-git/master
Updated ru_RU.lang
2023-11-26 20:28:07 +01:00
Bob
06181f08d9 yeah whatever 2023-11-26 20:27:58 +01:00
Bob
bdbb960db2 we gotta move these color TVs 2023-11-26 20:27:15 +01:00
Boblet
ba014d54f7 new radar targeting interface, second GUI, target localiaztion 2023-11-26 20:27:06 +01:00
Bob
e40343b6dd crunchier tier 1 missiles 2023-11-26 20:26:51 +01:00
Boblet
23a55a23a2 ABMs with SmЯt™ predictive targeting technology 2023-11-26 20:26:42 +01:00
Bob
b6f9953b3e *blows up missile with mind* 2023-11-26 20:26:37 +01:00
Boblet
7323fe31da more missile fun 2023-11-26 20:26:31 +01:00
Boblet
927abb9066 guh 2023-11-26 20:26:24 +01:00
Boblet
a28156065f nuclear blast furnace IO config 2023-11-26 20:26:13 +01:00
HbmMods
8944744142 Merge pull request #1247 from Ice-Arrow/master
Make the research reactor compatible with IC2's water changes
2023-11-26 20:26:05 +01:00
Bob
5081dccb19 tweaks, fixes, radar crap 2023-11-26 20:25:31 +01:00
Bob
353049c538 missile rewrite, terrain scan radar 2023-11-26 20:22:23 +01:00
Boblet
1bc94c989b finally checking this off my bucket list 2023-11-26 20:21:49 +01:00
Boblet
45fe9a81b2 MINE THE NITRA FOR AMMO 2023-11-26 20:21:41 +01:00
Boblet
c47e96c3cd even more radar stuff 2023-11-26 20:20:24 +01:00
HbmMods
089b390708 Merge pull request #1242 from JameH2/hbm
The Convenience Store
2023-11-26 20:20:16 +01:00
Boblet
64c53be869 more radar crap 2023-11-26 20:19:27 +01:00
Bob
e13e926ae3 radar rewrite, first attempt 2023-11-26 20:19:13 +01:00
Bob
d0d8f2c285 texture sheet 2023-11-26 20:18:38 +01:00
Doctor17-git
fb176ef633
Updated ru_RU.lang
updated russian localization
2023-11-26 21:07:24 +03:00
BallOfEnergy
4451e80db9 Large update to direct calls and limits for pulling values. 2023-11-14 21:30:48 -06:00
BallOfEnergy
2f2f389e90 Gas turbine compat!!! 2023-11-14 19:41:10 -06:00
BallOfEnergy
17044d558b back at it again with the OC compat
Now including:
Optimizations
Turbine Compat
Compat handler for general functions
other compat
2023-11-14 19:18:43 -06:00
BallOfEnergy
f1282b327c
Merge branch 'HbmMods:master' into New_master 2023-11-14 18:17:29 -06:00
BallOfEnergy
c5f30afab0 first commit on new shit 2023-11-14 18:17:03 -06:00
Boblet
15ceba1501 even more radar stuff 2023-11-14 15:22:35 +01:00
HbmMods
a23d68d904
Merge pull request #1243 from sdddddf80/text-transfer
Transferred a bunch of text to lang file
2023-11-14 10:24:44 +01:00
HbmMods
2cf88b18ed
Merge pull request #1242 from JameH2/hbm
The Convenience Store
2023-11-14 10:19:43 +01:00
Boblet
e977d11865 more radar crap 2023-11-13 16:08:36 +01:00
Bob
fc7f230ddb radar rewrite, first attempt 2023-11-12 21:11:38 +01:00
Bob
0d37bfe8fc texture sheet 2023-11-11 14:07:19 +01:00
sdddddf80
fe152fb676 Transferred a bunch of text to lang file
Transferred a bunch of text to lang file(not all)
2023-11-08 16:47:35 +08:00
Boblet
a5c49f6d64 flixes 2023-11-07 15:59:04 +01:00
JameH2
1fd672f167 wow i cant believe you forgot these kill yours 2023-11-06 14:17:45 -07:00
JameH2
1e43e00b33 ribbit 2023-11-06 14:03:13 -07:00
Bob
2090ac553d abracadabra 2023-11-06 19:05:44 +01:00
Bob
973b7eb4b0 you fucking asshole how about you cut that shit out 2023-11-06 18:54:24 +01:00
Bob
bfb45399dd Auto stash before merge of "master" and "origin/master" 2023-11-06 18:52:24 +01:00
HbmMods
1332f14429
Merge pull request #1240 from Doctor17-git/master
Updated ru_RU.lang
2023-11-06 16:50:03 +01:00
Boblet
5d8704e150 ow 2023-11-06 16:43:44 +01:00
Doctor17-git
7191979677
Updated ru_RU.lang
updated russian localization
2023-11-06 00:25:08 +03:00
Bob
98b05b1c70 birb 2023-11-05 22:07:07 +01:00
Bob
ca9d8e74e0 i wonder if the sky people like me 2023-11-04 23:31:20 +01:00
Boblet
40626b5cef this either fixes post impact mob spawning or destroys everything 2023-11-02 14:52:04 +01:00
Boblet
ba61cc42a8 quick gordon, the mcgriddle is still on the menu! 2023-11-02 14:12:39 +01:00
Bob
f89697665c none may enter the orb 2023-11-01 22:13:35 +01:00
Boblet
ad7032c74d leftovers from last week's shit buffet 2023-10-31 15:30:01 +01:00
Bob
a44f31279b wood burner GUI 2023-10-30 21:13:35 +01:00
Bob
505bdbf863 more half-finished crap 2023-10-29 19:01:17 +01:00
Boblet
682703eec0 tweaks 2023-10-27 14:15:46 +02:00
Bob
189d56a322 fat pigeons 2023-10-26 18:20:15 +02:00
Bob
eb602d2707 wretched abominations 2023-10-23 21:23:23 +02:00
Boblet
1ba07217ec flying rats 2023-10-23 16:55:38 +02:00
Bob
42d7882637 more unfinished crap 2023-10-22 18:17:07 +02:00
Bob
565fea133e biombe dicshonary 2023-10-18 22:36:23 +02:00
Bob
d2e94af59d improved nature documentaries 2023-10-18 22:25:19 +02:00
Bob
0563ef2560 *insert megalovania here* 2023-10-17 22:01:09 +02:00
Boblet
6ba6f294e2 fixed arc welder template file 2023-10-17 16:22:48 +02:00
Boblet
f846b7884d plenty of fixes 2023-10-16 16:00:10 +02:00
Bob
e5fdb7cf8d updated localization 2023-10-15 19:25:53 +02:00
Bob
a29dd00477 there is no greater joy than shooting a man in this walmart of a world 2023-10-12 22:25:42 +02:00
Bob
e479041f8d fixes 2023-10-12 22:23:14 +02:00
Bob
7e5e2ce1c5 cyclotron automation yeah 2023-10-11 20:37:23 +02:00
Boblet
2b7ffd6902 recipe tweaks 2023-10-11 16:51:42 +02:00
Bob
997c4fd757 shitting bricks 2023-10-08 19:43:00 +02:00
HbmMods
3ac4c330b7
Merge pull request #1215 from Doctor17-git/master
Updated ru_RU.lang
2023-10-08 18:54:33 +02:00
Doctor17-git
e02a1ed181
Updated ru_RU.lang
updated russian localization
2023-10-08 19:53:38 +03:00
Bob
b702816057 finished arc welder, fixes 2023-10-08 18:45:45 +02:00
HbmMods
4112a11438
Merge pull request #1208 from sdddddf80/custom-machine-structure-tool
A simple tool for generating custom machine multi block structure code
2023-10-06 15:08:11 +02:00
Boblet
81b6df6962 container fix for custom fluids, arc welder stuff 2023-10-06 15:00:43 +02:00
Bob
a40dbd882a arc welder stuff 2023-10-05 22:42:19 +02:00
Boblet
89638ae817 and now for custom fluids 2023-10-04 15:26:17 +02:00
Bob
d247f1dff0 SILEX tweaks, arc welder model 2023-10-03 22:08:06 +02:00
Boblet
d0530d2d7f fullerite 2023-10-03 15:26:29 +02:00
Bob
a8fd547320 fuck you 2023-10-02 22:06:24 +02:00
sdddddf80
47d645d481 A simple tool for generating custom machine multi block structure code
Add a simple tool for generating custom machine multi block structure code, as manually filling in these structural codes is really exhausting, especially when the structure is large.
2023-10-02 20:27:17 +08:00
HbmMods
aa50c1c79a
Merge pull request #1207 from Doctor17-git/master
Updated ru_RU.lang
2023-10-01 18:37:43 +02:00
Doctor17-git
1c071dddb7
Updated ru_RU.lang
updated russian localization
2023-10-01 19:03:59 +03:00
Bob
5e3a9480e1 huzzah 2023-10-01 17:33:27 +02:00
Bob
743b7a1576 two weeks of agony are finally paying off 2023-09-30 21:05:46 +02:00
Bob
abb96d8f4b stalingrad 2023-09-30 19:46:09 +02:00
Bob
ad2174b639 𓂧𓅃𓄿𓋴𓈎𓃭𓅓 CURSE OF RAH 𓅓𓆑𓅱𓆓𓎼𓅃 2023-09-29 23:07:47 +02:00
Boblet
44aaac040c small fixes 2023-09-29 14:18:38 +02:00
Bob
d7ff947bbf powered condenser 2023-09-28 22:49:12 +02:00
Boblet
6918974095 boring ahh GUI crap 2023-09-28 16:19:43 +02:00
Bob
1a318e2867 condenser model 2023-09-27 22:20:06 +02:00
Boblet
2986382029 drone GUI crap 2023-09-27 16:25:30 +02:00
Bob
abec6b14d1 my personal hell is southend-on-sea 2023-09-25 21:23:36 +02:00
Boblet
250ee7c383 even more drone crate stuff 2023-09-25 16:42:02 +02:00
Bob
9528ce8afe redcoil fix, no more shredding of blocks with the "Any" prefix, GUIs 2023-09-24 20:31:04 +02:00
Bob
f5c17f8bd7 smart pathing waypoints 2023-09-23 23:34:22 +02:00
Boblet
bb591306db custom falling block, mojang stink 2023-09-22 15:24:23 +02:00
Boblet
b1dd140737 loading dock for drones 2023-09-21 15:30:32 +02:00
Boblet
ac1d496bf6 the malicious gigglefish from the silly dimension 2023-09-20 16:27:52 +02:00
Bob
0405cd51fb Merge remote-tracking branch 'origin/master' 2023-09-18 21:37:07 +02:00
Bob
ee34c59908 pain² 2023-09-18 21:37:01 +02:00
HbmMods
95a5e54b2f
Merge pull request #1199 from Doctor17-git/master
Updated ru_RU.lang
2023-09-17 22:08:48 +02:00
Bob
8ce3e9837b "today i will get shit done" and other jokes you can tell yourself 2023-09-17 20:11:53 +02:00
Doctor17-git
ab659a405d
Updated ru_RU.lang
яй
2023-09-16 22:44:40 +03:00
Doctor17-git
cf903adf3a
Updated ru_RU.lang
updated russian localization
2023-09-16 20:59:06 +03:00
Bob
24ef4cb0ca power gauge, fixes 2023-09-16 19:46:56 +02:00
Bob
b077a65624 new telex model, sound adjustments 2023-09-15 21:18:53 +02:00
Boblet
b04e73422d ashpit NEI handling, ashpit for chimneys, removed old trash, fixes 2023-09-15 13:10:36 +02:00
HbmMods
1117f00892
Merge pull request #1192 from 70000hp/cobalt-stuffs
The Goodening of Cobalt & Starmetal Gear
2023-09-15 07:54:40 +02:00
70000hp
e1af74b781 improvement to recipes 2023-09-14 19:33:11 -04:00
Bob
82fca1ce88 even girthier smokestacks 2023-09-14 23:16:53 +02:00
HbmMods
7e0865775d
Merge pull request #1191 from 70000hp/hough
Actually added Burst fire to josh now
2023-09-13 13:33:37 +02:00
Boblet
ced46c8393 Merge remote-tracking branch 'origin/master' 2023-09-13 13:32:41 +02:00
Boblet
45436906da dude why 2023-09-13 13:32:33 +02:00
HbmMods
887201031c
Merge pull request #1195 from MartinTheDragon/duct-sounds
Default duct sounds and versatile ModSoundType
2023-09-13 13:28:04 +02:00
Bob
282228239f fixes, armor sprites 2023-09-12 22:04:26 +02:00
MartinTheDragon
283569d28f
Play pipe sound when placing default ducts 2023-09-12 15:50:12 +02:00
MartinTheDragon
7ed5342921
Make ModSoundType more versatile
- Fine-grained control over block sound subtypes
- Allows copying from existing sounds
- Volume and pitch envelopes

Also moved custom sound types into their own class.
2023-09-12 15:43:31 +02:00
Boblet
fb09867517 stuff the world doesn't need 2023-09-12 14:46:17 +02:00
Bob
d9a700ca57 fixed armor legs, alternate firebrick recipe 2023-09-11 22:02:59 +02:00
Boblet
2ee2bda4e9 pump fixes, finished telex 2023-09-11 15:47:25 +02:00
Bob
37eb69e47d wa'er pumps, new capacitor, fixes 2023-09-10 21:02:20 +02:00
Bob
360177414a the telex machine is kept so clean 2023-09-09 23:43:50 +02:00
70000hp
8bffbfc530 the goodening of cobalt & starmetal
Increases the durability and enchantability of starmetal and decorated cobalt tools
Makes decorated cobalt tools cheaper, made by a blast furnace recipe
Decreased the cost of cobalt armor significantly
Increased the resistance of cobalt armor to be slightly better than AA
Increased the enchantability of cobalt armor
2023-09-08 19:30:44 -04:00
70000hp
385453f1fb kill me 2023-09-08 18:13:04 -04:00
Boblet
82dafa437b hopefully fixed the malicious gigglefish from the silly dimension 2023-09-08 15:20:54 +02:00
Bob
3392ac21d9 telex hee hoo 2023-09-07 21:56:08 +02:00
Boblet
be51ae39d0 he make an big steppy 2023-09-07 15:33:27 +02:00
Bob
24444d6c4e shredder compat fix(?), trenchmaster armor 2023-09-06 21:27:31 +02:00
HbmMods
2e5fc5e86a
Merge pull request #1185 from 70000hp/bomber-fixes
Bomber Fixes
2023-09-06 15:22:11 +02:00
Boblet
d9416f650c textures, fixes 2023-09-06 15:13:22 +02:00
HbmMods
3ea888eccf
Merge pull request #1181 from 70000hp/burst-fire
Burst fire
2023-09-05 08:16:14 +02:00
70000hp
7c1bd3ad40 Cleaned up code and formatting 2023-09-04 18:31:09 -04:00
70000hp
bf400c3525 Bomber Fixes
Added a new helper function to WorldUtil which chunkloads an entity whenever it spawns and uses that helper function in the Airstrike Designator code to help the bombers load properly.
Also turned the rancid if chains into switches
2023-09-04 17:35:04 -04:00
70000hp
523d76133b Converted burst fire gun system to use NBT 2023-09-04 17:00:30 -04:00
Bob
3852faa470 UV 2023-09-04 21:58:28 +02:00
Vaern
43fafaccb1 :p 2023-09-03 20:41:20 -07:00
HbmMods
4cca836142
Merge pull request #1184 from Doctor17-git/master
Updated ru_RU.lang
2023-09-03 20:23:03 +02:00
Doctor17-git
5b8ab98286
Updated ru_RU.lang
updated russian localization
2023-09-03 20:48:33 +03:00
Bob
f6b22652ab changelog, version bump 2023-09-03 19:41:44 +02:00
HbmMods
015e3f36d6
Merge pull request #1179 from 70000hp/uac-pistol-uv-fix
UAC Pistol UV fix, and recipe
2023-09-03 18:30:12 +02:00
Bob
db288d06c7 conveyor press, fixes 2023-09-03 18:29:47 +02:00
Vaern
65aad4d894 Merge remote-tracking branch 'HbmMods/master' 2023-09-01 19:39:52 -07:00
70000hp
ad826215ee i forogr 2023-09-01 16:18:50 -04:00
70000hp
9e2d2dba01 burst fire for the UAC pistol 2023-09-01 16:09:21 -04:00
70000hp
16f710450c actual burst fire logic
also adds burst fire to josh
2023-09-01 16:07:48 -04:00
70000hp
56eafc2c67 A recipe for the UAC pistol 2023-09-01 15:17:24 -04:00
Boblet
96c1986ae9 fixes 2023-09-01 14:05:38 +02:00
Vaern
8a96acc190 tests 2023-08-31 16:24:46 -07:00
70000hp
bfe09fed47 Fixing the weird UV 2023-08-31 19:11:51 -04:00
HbmMods
1448241515
Merge pull request #1177 from 70000hp/josh-anims
Animations for Josh
2023-08-31 16:40:07 +02:00
HbmMods
6440a6fe4d
Merge pull request #1175 from 70000hp/ammo-variant-tweaks
Ammo variant tweaks
2023-08-31 16:36:32 +02:00
70000hp
cb90b2973c josh anims :3 2023-08-31 10:13:54 -04:00
Boblet
2ff5096562 spiralpoint visualization, less console spam from pollution handler 2023-08-31 15:50:42 +02:00
70000hp
e0d13496cd Improved chloro rounds logic 2023-08-30 12:28:48 -04:00
Boblet
07cf03b365 changelog + version bump 2023-08-30 09:42:25 +02:00
HbmMods
b589387fba
Merge pull request #1174 from Doctor17-git/master
Updated ru_RU.lang
2023-08-30 08:20:19 +02:00
Vaern
ddc34c2c1b Merge remote-tracking branch 'HbmMods/master' 2023-08-29 20:22:32 -07:00
70000hp
a7d393e663 some things I forgot 2023-08-29 16:56:00 -04:00
70000hp
48a058fadb less painful ammo recipes + chloro rounds fnuy 2023-08-29 16:14:19 -04:00
Doctor17-git
5a818173b3
Updated ru_RU.lang
updated russian localization
2023-08-29 18:27:40 +03:00
Boblet
328f84cdd4 missing tank textures, lang keys 2023-08-29 16:10:17 +02:00
Vaern
bd06c6ec8b hh 2023-08-28 15:35:12 -07:00
Bob
9d76d50bc6 bah 2023-08-28 17:35:12 +02:00
Boblet
edbe256217 fixes 2023-08-28 16:45:17 +02:00
Bob
4482e10999 the malicious gigglefish from the silly dimension 2023-08-27 19:29:37 +02:00
HbmMods
ba8aa1e4b1
Merge pull request #1165 from MartinTheDragon/better-crane-config-logic
Improve crane I/O screwdriver logic
2023-08-26 21:53:14 +02:00
Bob
51c5a3fdd4 tsar makeover, torex tweaks 2023-08-26 21:52:43 +02:00
MartinTheDragon
64db18a2b4
Improve crane I/O screwdriver logic
Instead of cycling through all directions, the side
the player clicks on will be manipulated directly, and, if
applicable, input will be swapped with output and vice versa.

Right-clicking normally changes the conveyor side,
shift-right-clicking the machine side.

Clicking on a side twice will manipulate the opposite side.
2023-08-26 21:28:36 +02:00
Vaern
ad8df5789d Merge remote-tracking branch 'HbmMods/master' 2023-08-26 09:04:59 -07:00
HbmMods
9f99034e96
Merge pull request #1164 from MartinTheDragon/curving-conveyor-cranes
Make conveyor crane I/O sides configurable
2023-08-26 15:42:49 +02:00
HbmMods
954e80d36e
Merge pull request #1163 from BallOfEnergy1/master
More OC Compatibility!
2023-08-26 15:41:06 +02:00
Bob
21a7337b9f recipes, mug PWR cooling 2023-08-26 15:40:10 +02:00
MartinTheDragon
a050ce51da
Make conveyor crane I/O sides configurable
Right click with a screwdriver to change output direction,
shift-right-click to change input direction.

The ton of textures were made by 70k

Co-authored-by: 70000hp <105080577+70000hp@users.noreply.github.com>
2023-08-26 15:31:02 +02:00
BallOfEnergy
dad189a24f better component name 2023-08-26 03:57:20 -05:00
BallOfEnergy
7e281069a7 Merge remote-tracking branch 'origin/master' 2023-08-26 03:54:50 -05:00
BallOfEnergy
93485afafe was testing something (forgot to remove an import) 2023-08-26 03:54:44 -05:00
BallOfEnergy
ae4122b46c
Merge branch 'HbmMods:master' into master 2023-08-26 03:51:46 -05:00
BallOfEnergy
f3c27c02e5 More Opencomputers compatibility!
:woo:
2023-08-26 03:47:34 -05:00
Bob
65587e7db7 PWR breeder rods, rod recycling, creative stirling 2023-08-25 21:48:45 +02:00
Bob
2928f832a3 fixes, flixes, adjustments
https://cdn.discordapp.com/attachments/979089797404565504/1144343034222350386/image.png
2023-08-24 22:04:11 +02:00
Boblet
549ecc0917 fancier PWR gauges, larger PWRs, fixes, finite corium fluid 2023-08-24 16:38:55 +02:00
HbmMods
a4a570b10a
Merge pull request #1159 from Vaern/resistance
Resistance Rework !!
2023-08-24 07:42:38 +02:00
HbmMods
1a0f4d6b10
Merge pull request #1145 from BallOfEnergy1/master
Fixed a small bug with the fluid burner.
2023-08-24 07:38:12 +02:00
Bob
5832d5dc2f torex condensation ring 2023-08-23 21:42:04 +02:00
Boblet
5cc3d38906 wabba dee 2023-08-23 15:50:20 +02:00
Vaern
fb3f08acd5 it took half an hour cuz gitkraken, the repo, and the av shat themselves
what a modern wonder
2023-08-22 21:07:59 -07:00
Vaern
3ebf9899a4 h 2023-08-22 20:48:17 -07:00
Bob
d3b559bd61 finished PWR ports, recipes 2023-08-22 21:10:24 +02:00
BallOfEnergy
6b62d7c295
Merge branch 'HbmMods:master' into master 2023-08-22 09:34:45 -05:00
Vaern
0609cd524c Merge remote-tracking branch 'HbmMods/master' 2023-08-21 18:50:13 -07:00
Bob
35b18dda34 do the bugshaker 2023-08-21 23:07:47 +02:00
Bob
450e519234 TOREX flash overlay 2023-08-21 22:09:54 +02:00
Boblet
ae44c8a2a4 sodalite, heatable heavy water, sodium 2023-08-21 16:04:25 +02:00
Bob
05f45e8a76 PWR controllability 2023-08-20 19:23:35 +02:00
Vaern
b6eaf25b99 i'm too tired
dr kel larping
2023-08-18 18:13:00 -07:00
Boblet
a7b741fe48 PWR heat transfer 2023-08-18 14:18:24 +02:00
Vaern
1cfef371ed Merge remote-tracking branch 'HbmMods/master' 2023-08-17 16:33:33 -07:00
Bob
24b883ec92 we have fission! 2023-08-17 22:00:35 +02:00
Boblet
fb97ffc88d PWR fuel, atomized primers 2023-08-17 15:42:53 +02:00
HbmMods
540183181f
Merge pull request #1151 from re7gog/master
Fixes for Crucible (Thermos fork)
2023-08-17 07:33:50 +02:00
Vaern
40af290153 mhmm 2023-08-16 20:44:32 -07:00
Vaern
b5df3b0979 Merge remote-tracking branch 'HbmMods/master' 2023-08-16 15:52:16 -07:00
Bob
0332853822 PWR GUI work, error messages, pre-calculation 2023-08-16 20:56:57 +02:00
Boblet
f7dd3a0a93 more PWR crap 2023-08-16 16:21:11 +02:00
Григорий Величко
cb0eb4271b
Fix hbmpollution.dat file on Crucible and probably Thermos 2023-08-16 15:24:51 +03:00
Григорий Величко
f912e572f7
Fix Thermos preventer on Crucible 2023-08-16 15:17:26 +03:00
Vaern
ff85ddfb16 containrs!!! 2023-08-15 21:23:59 -07:00
Vaern
72f892b7dd Merge remote-tracking branch 'HbmMods/master' 2023-08-15 18:16:18 -07:00
Bob
3c6e7920b5 PWR preparation 2023-08-15 20:42:48 +02:00
Bob
35d9e49f23 block drop fix for fallout effects 2023-08-14 20:11:26 +02:00
Boblet
6b381821b8 FENSU and DFC fixes 2023-08-14 16:40:14 +02:00
Vaern
474278cb1b Merge remote-tracking branch 'HbmMods/master' 2023-08-13 17:21:08 -07:00
BallOfEnergy
5205c57deb Merge remote-tracking branch 'origin/master' 2023-08-13 18:39:57 -05:00
BallOfEnergy
b9b48f5a60 Fixing minor bug where the fluid burner would produce soot even when there was no fluid to consume. 2023-08-13 18:39:23 -05:00
Bob
157456a0c8 ashpit 2023-08-13 21:04:12 +02:00
Bob
27648ca7a6 lanterns, heating oven connection fix 2023-08-12 22:46:59 +02:00
Vaern
10ab382cf6 shit 2023-08-11 22:22:11 -07:00
Bob
1a3596f33d finished leadburster, congo lake grenade launcher 2023-08-12 00:04:42 +02:00
Boblet
98ec88678a leadburster tweaks 2023-08-11 14:18:23 +02:00
Boblet
3b94f3dafd 40mm leadburster 2023-08-11 12:02:18 +02:00
HbmMods
e3d77e54e3
Merge pull request #1119 from BallOfEnergy1/master
Updated OpenComputers compatibility + slight change to concrete blast res
2023-08-11 08:05:06 +02:00
Boblet
30e2a13f62 fixing mojank spaghetti episode 58304 2023-08-10 15:18:54 +02:00
BallOfEnergy
4975397659
Merge branch 'HbmMods:master' into master 2023-08-09 16:47:46 -05:00
Bob
afd75b26af assets, fixes 2023-08-09 22:28:14 +02:00
Vaern
dd5dc6ed93 Merge remote-tracking branch 'HbmMods/master' 2023-08-08 21:48:50 -07:00
Vaern
4f7659a5dc funny 2023-08-08 21:48:44 -07:00
BallOfEnergy
02e80da344 whoops forgot to change the component name (also added the getFluid() function to the pipe gauge) 2023-08-08 14:14:32 -05:00
BallOfEnergy
e02e28b5d0 Boiler fix and fluid gauge compatibility re-added. 2023-08-08 13:17:13 -05:00
BallOfEnergy
3387cc7f4e idk why those imports were there (removed them) 2023-08-08 13:16:25 -05:00
BallOfEnergy
3fc67e79e1
Merge branch 'HbmMods:master' into master 2023-08-08 12:38:30 -05:00
Boblet
dcfa7fe811 universal analysis tool, pipe debugging 2023-08-08 15:13:11 +02:00
HbmMods
60c4684158
Merge pull request #1135 from Reallondoner/master
Update pl_PL.lang
2023-08-08 09:07:26 +02:00
Reallondoner
b136cbcd62 Update pl_PL.lang
before starting to translate this i thought to myself, "how hard can this be"? turns out, im handing over an assignment that is 30% done

stopped at line 1542, im too tired man, someone finish this because i certainly wont. ive been doing this since march

"At least 99% of what is left to translate are blocks and items, so it shouldnt be that hard" - statements dreamed up by the utterly Deranged

also please check if the oil names are correct theyre quite confusing :)
2023-08-07 18:24:57 +02:00
Bob
f9a81f9b21 finished electrolysis recipes 2023-08-06 19:27:14 +02:00
BallOfEnergy
c18b5dcef5
Merge branch 'master' into master 2023-08-06 03:52:26 -05:00
BallOfEnergy
fa1fd5a65c Merge branch 'master' of https://github.com/BallOfEnergy1/Hbm-s-Nuclear-Tech-GIT-OC 2023-08-06 03:39:08 -05:00
Vaern
5423359205 Merge remote-tracking branch 'HbmMods/master' 2023-08-05 18:59:18 -07:00
Vaern
034c74a55d boo womp 2023-08-05 18:59:07 -07:00
Bob
93ded2740a NEI handlers, more suffering 2023-08-05 20:09:21 +02:00
Bob
ef44b79f83 suffering builds character 2023-08-05 16:33:23 +02:00
BallOfEnergy
61ab7a3483
Merge branch 'HbmMods:master' into master 2023-08-04 15:59:12 -05:00
Bob
77dc34c5a8 mitty! 2023-08-04 15:01:58 +02:00
Vaern
65d4999989 decoration 2023-08-03 22:13:24 -07:00
BallOfEnergy
b168a31350
Merge branch 'master' into master 2023-08-03 18:28:11 -05:00
Bob
09b83da578 armor UV, fixes, electrolyzer recipes 2023-08-03 13:37:23 +02:00
BallOfEnergy
39e37f0676 Fixed a minor bug in the coordinate OC compat for launch pads, also removed a feature because it keeps throwing a NullPointerException and I have no clue how to fix it 2023-08-03 02:36:58 -05:00
BallOfEnergy
5e1f3b3134 Makes the new functions direct calls, which I had forgotten to do beforehand. 2023-08-03 00:51:12 -05:00
Vaern
b677214381 argh 2023-08-02 14:44:52 -07:00
BallOfEnergy
eaedb33a77 Revamped OpenComputers compatibility, the following is a list of changes/additions.
Added compatibility to the large launch pad
Changed the way that fluids are handled by OC, they now use the internal names of said fluids.
Changing over to a more compact function for energy related compatibility, not doing it fully until people have a bit of time to modify their programs.
Fixed a minor bug where changing the steam type using OC in a RBMK boiler could potentially make infinite steam.
Wiki will be updated for the compatibility on merge of this PR.
2023-08-01 23:49:50 -05:00
BallOfEnergy
dc2387f480
Merge branch 'master' into master 2023-08-01 15:08:01 -05:00
Vaern
b0d2d86fdc hehe 2023-07-31 22:39:11 -07:00
Bob
a869a57ff2 NEI handlers for custom machines, nether bedrock ores, electrolyser crap 2023-07-31 20:45:57 +02:00
Bob
647c837909 and now for something completely different 2023-07-30 19:00:35 +02:00
BallOfEnergy
1570f2750a Merge remote-tracking branch 'origin/master' 2023-07-28 16:23:51 -05:00
BallOfEnergy
52f39064fc removed the compat for the fluid gauge due to crashes related to the TE. 2023-07-28 16:23:36 -05:00
BallOfEnergy
b0aba8a77a
Merge branch 'master' into master 2023-07-25 15:37:19 -05:00
Bob
1ffb2737aa ow 2023-07-25 22:21:48 +02:00
HbmMods
244fbacd39
Merge pull request #1125 from sdddddf80/Custom-machine-structure-display
Add structure display for custom machine
2023-07-25 22:06:03 +02:00
HbmMods
5c10417308
Merge pull request #1123 from Toshayo/master
Satellites. Yeah. They're cool.
2023-07-25 22:05:09 +02:00
sdddddf80
a23e9be2a7 add Structure display for custom machine 2023-07-25 13:50:16 +08:00
HbmMods
ff86bf3602
Merge pull request #1124 from Doctor17-git/master
Updated ru_RU.lang
2023-07-24 18:00:10 +02:00
Doctor17-git
4cf0e5d531
Updated ru_RU.lang 2023-07-24 15:46:34 +03:00
Toshayo
ccb91d98bf
Added satellite managing commands, fixed some satellite map storage stuff 2023-07-24 14:06:46 +02:00
Toshayo
a22a68744c
Satellite linker will no more give duplicate frequency. Some satellite code improvements, rearrangements 2023-07-24 12:44:32 +02:00
Bob
33bd961e0c toora loora 2023-07-24 12:03:13 +02:00
Bob
4bc09afb1f even more custom machine crap 2023-07-22 18:30:32 +02:00
BallOfEnergy
0a0af7e363 changed concrete bricks and rebar reinforced concrete blast resistances to be more reasonable as per their recipes 2023-07-20 20:41:21 -05:00
Bob
0fdfae999e hey shitass, stop fucking with my gitignore 2023-07-19 14:45:32 +02:00
HbmMods
0efb99b78c
Merge pull request #1117 from BallOfEnergy1/ocshit
Added OC compatibility to yet another block (more coming soon)
2023-07-19 11:17:22 +02:00
Bob
4c3047c121 glaggle 3: return to blibble's field 2023-07-19 11:15:42 +02:00
BallOfEnergy
8d22bda8fb fix the OC part where I18nUtil was being called (no longer is it being called) 2023-07-18 20:45:54 -05:00
BallOfEnergy
c1896aa4fb
Merge branch 'HbmMods:master' into master 2023-07-18 20:39:36 -05:00
BallOfEnergy
02e1ae5fbc Revert "RBMK redstone column that doesn't work (will work eventually)"
This reverts commit 424d6c3486d0c5ffb4d7e9f7d951c026ba48f7fb.
2023-07-18 20:34:59 -05:00
BallOfEnergy
3041e68896 there you got your damn comparator support for tanks 2023-07-18 20:27:41 -05:00
Bob
ecec7e5a36 the malicious gigglefish from the silly dimension 2023-07-18 18:34:16 +02:00
BallOfEnergy
91e52dc665 Fluid Gauge OC compat for reading fluid flows. 2023-07-17 14:21:19 -05:00
BallOfEnergy
949b4ae66a
Merge branch 'HbmMods:master' into master 2023-07-17 14:17:53 -05:00
BallOfEnergy
1d756bc671 Fluid Gauge OC compat for reading fluid flows. 2023-07-17 14:16:58 -05:00
Bob
05c87528a0 youch 2023-07-17 10:30:41 +02:00
Bob
0ff16c1a6c more coilgun ammo 2023-07-16 20:39:28 +02:00
Bob
ea8dcd9508 tweaks and fixes, template crate 2023-07-15 22:30:49 +02:00
Boblet
24a0fbffef ported all bullet effects to the NT system 2023-07-14 15:09:46 +02:00
BallOfEnergy
424d6c3486 RBMK redstone column that doesn't work (will work eventually) 2023-07-13 23:39:04 -05:00
Bob
5bcffadbab new bullet base code 2023-07-13 20:20:14 +02:00
HbmMods
078566064c
Merge pull request #1114 from Doctor17-git/master
Updated ru_RU.lang
2023-07-12 23:33:01 +02:00
Doctor17-git
0563315be6
Updated ru_RU.lang
updated russian localization
2023-07-13 00:32:17 +03:00
Bob
6bd552f3be cryo cannon, bullet stuff 2023-07-12 23:23:14 +02:00
Boblet
13c4cdc24d cryo cannon 2023-07-11 16:06:44 +02:00
Bob
18a1b103ba some pistol tweaks, compressor fix, cryo cannon texture 2023-07-10 21:38:41 +02:00
Boblet
de028bb5e1 UAC pistol, damage util crap, mk5 fix 2023-07-10 15:48:09 +02:00
Bob
b443c3449d fuck you fuck you fuck you fuck you fuck you fuck you fuck you fuck you 2023-07-09 19:46:38 +02:00
HbmMods
7a501e48c8
Merge pull request #1105 from Maksymisio/master
Create pl_PL.lang
2023-07-09 17:29:12 +02:00
Bob
925236e538 iboiler texture, coilgun, bunch of fixes, recipes 2023-07-09 17:28:11 +02:00
Maksymisio
08fb15caac Create pl_PL.lang
Added incomplete polish translation
2023-07-08 23:40:30 +02:00
Boblet
873e41558f and now for something completely different 2023-07-07 09:20:32 +02:00
Bob
bc8dfcaa99 coolers 2023-07-06 20:48:25 +02:00
Boblet
e78406f64f redstone over radio item counter 2023-07-06 15:33:05 +02:00
HbmMods
69fc7b826f
Merge pull request #1102 from Toshayo/master
Fixed satellite loot being overridden by lunar mining ship
2023-07-05 22:43:50 +02:00
Bob
25a7a6c345 new multiblock sys for assembler 2023-07-05 22:42:36 +02:00
Bob
5f109b61ec i can't feel my limbs 2023-07-05 22:26:20 +02:00
Toshayo
c5d1960842
Fixed satellite loot being overridden by lunar mining ship 2023-07-05 21:20:58 +02:00
Boblet
ea9dc777fb labels, glyphid egg recycling 2023-07-05 16:37:22 +02:00
Bob
4ad28d25f4 industrial boiler 2023-07-04 22:12:10 +02:00
Boblet
d09813957e small fixes 2023-07-03 15:41:39 +02:00
HbmMods
97da9429e1
Merge pull request #1097 from Doctor17-git/master
Updated ru_RU.lang
2023-07-02 19:13:34 +02:00
Doctor17-git
9c7b219b58
Updated ru_RU.lang
updated russian localization
2023-07-02 20:06:46 +03:00
Bob
e6fd6900bb oop 2023-07-02 19:00:34 +02:00
Bob
843efd575e some train stuff 2023-07-02 18:59:47 +02:00
Bob
d45f0098d5 *chuckles* i'm in danger 2023-07-01 21:52:08 +02:00
Bob
65ed6a4f9a helium 4 plasma 2023-07-01 21:43:29 +02:00
HbmMods
738e698d72
Merge pull request #1096 from HbmMods/pr1083
Pr1083
2023-07-01 20:27:59 +02:00
Bob
e46acfb19a beep beep 2023-07-01 20:26:53 +02:00
Bob
8bc1f73075 big smoke 2023-07-01 19:19:09 +02:00
Boblet
fcfa725f0b pipable exhaust 2023-06-30 11:57:28 +02:00
Boblet
68f9f20f5c some tweaks 2023-06-30 08:07:34 +02:00
HbmMods
7029373881
Merge pull request #1083 from Toshayo/master
Some random stuff and Sliding Blast Door
2023-06-30 07:56:18 +02:00
HbmMods
4f67d5b11f
Merge branch 'pr1083' into master 2023-06-30 07:56:09 +02:00
HbmMods
0b36b76f3e
Merge pull request #1084 from Voxelstice/pylon-stuff
Wiring errors with slightly more info
2023-06-30 07:54:05 +02:00
Bob
7c1d5bd3e3 fixes, localization, chimney 2023-06-29 20:59:13 +02:00
Boblet
61132bd310 I REMBER 2023-06-29 16:08:32 +02:00
Bob
cd12d6d9af configs configs, glyphid meat, yummy yummy fruit salad 2023-06-28 22:05:29 +02:00
Boblet
cd7b68d7ce glyphid spawn limit 2023-06-27 16:31:50 +02:00
Vaern
689393f00b Merge remote-tracking branch 'origin/master' 2023-06-26 14:01:42 -07:00
Voxelstice
f29a9d7250
those extra 2 lines aren't useful anymore 2023-06-26 22:33:11 +03:00
Voxelstice
f9959e9a4a aaaaaaaaaaaaaaaaaa 2023-06-26 22:31:53 +03:00
Bob
7c8b8385f1 Merge remote-tracking branch 'origin/master' 2023-06-26 19:52:44 +02:00
Bob
0ac2445329 i'll fucking shoot somebody 2023-06-26 19:52:36 +02:00
Toshayo
28c43462f1
Merge remote-tracking branch 'HbmMods/master' 2023-06-26 19:25:49 +02:00
HbmMods
8a6b9d1e65
Merge pull request #1092 from Vaern/lore
Lore
2023-06-26 18:38:57 +02:00
Vaern
b853faf265 a 2023-06-26 09:38:17 -07:00
Vaern
ae88efa449 joever 2023-06-26 09:36:33 -07:00
Bob
749a65c4fe doxotron 2023-06-26 18:26:59 +02:00
Boblet
9875f5a9c2 small fixes, config options 2023-06-26 16:12:58 +02:00
HbmMods
a29e6232f4
Merge pull request #1088 from Doctor17-git/master
Updated ru_RU.lang
2023-06-25 19:27:51 +02:00
Doctor17-git
09e3a66173
Updated ru_RU.lang
updated russian localization
2023-06-25 20:22:57 +03:00
Bob
ff3afbf028 ow 2023-06-25 19:10:29 +02:00
Vaern
296af599dc lore 2023-06-24 23:55:24 -07:00
Vaern
6e2f26f7e7 Merge remote-tracking branch 'origin/master' into lore 2023-06-24 14:49:00 -07:00
HbmMods
682550616f
Merge pull request #1085 from Doctor17-git/master
Updated ru_RU.lang
2023-06-24 17:55:11 +02:00
Bob
99cfce0e5d pollution effects for heavy metal and poison 2023-06-24 17:54:46 +02:00
Doctor17-git
c32e20daf7
Updated ru_RU.lang 2023-06-24 10:14:45 +03:00
Doctor17-git
c7e428d927
Updated ru_RU.lang
updated russian localization
2023-06-24 10:12:24 +03:00
Bob
00360a4586 memepackhunters.xxx 2023-06-23 23:06:44 +02:00
Boblet
bb15f50047 pressure requirement for recipes 2023-06-23 11:17:37 +02:00
Voxelstice
9c4c081e3e hh 2023-06-23 11:52:55 +03:00
Toshayo
39b2d394f9
Merge remote-tracking branch 'HbmMods/master' 2023-06-22 21:38:17 +02:00
Bob
ff4b231be2 more compressor stuff 2023-06-22 21:02:19 +02:00
Toshayo
53267f2185
Idk how did this spawn 2023-06-22 19:12:51 +02:00
Toshayo
5c9f78f8a2
Merge remote-tracking branch 'HbmMods/master'
# Conflicts:
#	changelog
2023-06-22 19:07:48 +02:00
Toshayo
a99dc0a464
Grenade with cats 2023-06-22 19:05:10 +02:00
Boblet
d6cdc69c89 pressure 2023-06-22 14:59:54 +02:00
Toshayo
b736b64f7f
Updated changelog 2023-06-22 14:51:42 +02:00
Toshayo
73987a5b1c
Merge remote-tracking branch 'HbmMods/master' 2023-06-22 14:45:15 +02:00
Toshayo
eafc615fd2
Added night vision goggles 2023-06-22 14:42:30 +02:00
Toshayo
0be6b66446
Improved satellite loot system again so lunar loot is in lunar satellite and not in random class 2023-06-22 09:01:09 +02:00
Toshayo
9f873e6b76
Skin name in door skin item 2023-06-22 08:31:45 +02:00
Toshayo
c3f13a8786
Added logging of item stats re-registration end 2023-06-22 08:25:32 +02:00
Toshayo
71814dae87
Some clean-up 2023-06-21 22:45:55 +02:00
Toshayo
7d8ee8ce24
Ported Sliding Blast Door from 1.12.2 using new door API. Introduced door skins 2023-06-21 22:40:56 +02:00
Bob
ee7c10174a compressor recipes 2023-06-21 21:47:20 +02:00
Boblet
dfa5d41d05 Merge remote-tracking branch 'origin/master' 2023-06-21 13:53:26 +02:00
Boblet
6c32813bae FBI drones 2023-06-21 13:53:15 +02:00
HbmMods
8d0eaf3818
Merge pull request #1081 from Vaern/lore
book lores yipppeeeee
2023-06-21 08:48:43 +02:00
Vaern
fdb4a1c39e Whoops! 2023-06-20 23:20:58 -07:00
Vaern
4c944d6f2e hid book lore from nei 2023-06-20 23:12:40 -07:00
Bob
2ef47c8604 better pathfinding, BDCL, nuclear glyphid improvements 2023-06-20 20:28:00 +02:00
Boblet
0a341411c8 nuclear bulkie, better pathfinding 2023-06-20 16:07:29 +02:00
Vaern
a5a5227a5d Merge remote-tracking branch 'origin/master' into lore 2023-06-19 19:55:07 -07:00
Boblet
f17a1280d7 welded fusion reactor magnets 2023-06-19 16:22:03 +02:00
Vaern
9183ea7d32 Transfer of item book lores to updated system 2023-06-18 21:58:17 -07:00
Vaern
6e04fcd720 Moved book lores to NBT, so much better 2023-06-18 14:30:51 -07:00
Bob
f2886ea33e spicy himars ammo, more glyphid crap, compressor work 2023-06-18 20:11:36 +02:00
Vaern
0a8ec4a389 reworked book lore's clientside 2023-06-17 18:24:29 -07:00
Bob
febeafe459 glyphid hives 2023-06-17 22:55:05 +02:00
Bob
5411e3fa3f glyphid bombardier, train collisions 2023-06-17 18:29:57 +02:00
Boblet
9b2826465c brenda is coming 2023-06-16 13:53:42 +02:00
Bob
ec052ca2b8 enhanced glyphid crumblyness 2023-06-15 22:56:41 +02:00
Boblet
c004912941 glyphids 2023-06-15 15:13:24 +02:00
Bob
3f2e7313a9 the biting thing 2023-06-14 22:25:54 +02:00
Boblet
4cd26174fb more pollution, igen defuckening part 4 2023-06-13 16:30:46 +02:00
HbmMods
dd8005f60f
Merge pull request #1070 from BallOfEnergy1/master
Minor addition in pollution code. (clamping values)
2023-06-13 09:54:39 +02:00
Boblet
1c7d8e41f0 leaded fuel pollution 2023-06-13 09:54:26 +02:00
BallOfEnergy
1406cb47d9 Removing the clamp on pollution until I can think properly. 2023-06-12 15:44:29 -05:00
BallOfEnergy
3875309697
Merge branch 'HbmMods:master' into master 2023-06-12 14:19:30 -05:00
Boblet
58b08ac039 explosion chunk loader config 2023-06-12 14:32:23 +02:00
HbmMods
625bdac1a4
Merge pull request #1071 from Toshayo/master
Curseforge publishing improvements
2023-06-12 14:01:07 +02:00
Boblet
2a01d7f2fb configurable fluid traits 2023-06-12 13:58:19 +02:00
Toshayo
e94548ed0c
Better CurseForge task configuration: display name, game versions and a fix for changelog backup not being replaced 2023-06-12 11:58:29 +02:00
Toshayo
d3e6e22600
Bring back CurseForge config example file 2023-06-12 11:18:15 +02:00
Toshayo
11fc87d0ad
Changed decimal colors to hexadecimal 2023-06-12 11:16:40 +02:00
BallOfEnergy
506a70a413 geiger counter OC compat 2023-06-11 23:26:53 -05:00
BallOfEnergy
3ab84d4f8a Percentage my beloved 2023-06-11 22:31:53 -05:00
BallOfEnergy
b9c2371848 Small changes to Boiler callback code following the change with OC and string returns. 2023-06-11 21:52:31 -05:00
BallOfEnergy
d3907c72aa Minor addition in pollution code. (clamping values) 2023-06-11 20:59:22 -05:00
HbmMods
07c0fc0d86
Merge pull request #1068 from Doctor17-git/master
Updated ru_RU.lang
2023-06-11 18:08:24 +02:00
Doctor17-git
5d13557f23
Updated ru_RU.lang
updated russian localization
2023-06-11 19:07:35 +03:00
Bob
692c8acc45 localization 2023-06-11 17:08:16 +02:00
HbmMods
e3669f51d0
Merge pull request #1067 from BallOfEnergy1/master
Extended OC Compatibility along with a minor bugfix
2023-06-11 17:02:52 +02:00
Bob
41648d4f68 fixes, rail stuff 2023-06-11 17:01:33 +02:00
BallOfEnergy
c050e099af Urgent: getInfo function for fuel rods was fucked, and returned an unknown error when invoked. Fixed in this commit. 2023-06-10 22:30:15 -05:00
BallOfEnergy
14d11cef7f added some stuff, removed some useless and stupid things 2023-06-10 21:57:52 -05:00
Bob
792a75e324 brick by brick, suck my di 2023-06-10 17:49:44 +02:00
Bob
6710370f81 more capacitors, rail stuff 2023-06-10 16:06:53 +02:00
HbmMods
36655d25b5
Merge pull request #1065 from Vaern/bunkers-(for-real)
Bunkers (for real)
2023-06-10 10:20:41 +02:00
HbmMods
6d161b3d0b
Merge pull request #1066 from BallOfEnergy1/patch-1
Minor addition to OC compatibility
2023-06-10 10:17:22 +02:00
HbmMods
0254193d21
Merge pull request #1062 from UFFR/desh_stamps
🅱️esh gaming
2023-06-10 10:16:58 +02:00
Bob
c2f05f4d11 gold capacitor 2023-06-10 10:16:15 +02:00
BallOfEnergy
de28eff0c7
Another small addition 2023-06-10 02:04:56 -05:00
BallOfEnergy
189c861cf0
added something to outgasser OC compat
the smallest change imaginable (added a callback for checking gas type)
2023-06-09 21:19:19 -05:00
Vaern
55d2330219 destroy 2023-06-09 13:50:07 -07:00
Vaern
3880daea25 Merge remote-tracking branch 'origin/master' into bunkers-(for-real) 2023-06-09 13:41:19 -07:00
Vaern
5df2465a16 o 2023-06-09 13:41:04 -07:00
Vaern
0239ea7968 finished enough 2023-06-09 13:36:57 -07:00
Boblet
4f8f750bee liquefied pain 2023-06-09 14:11:06 +02:00
Boblet
31e5caa2db capacitor blocks 2023-06-09 11:35:02 +02:00
Vaern
3ecc74f6db reactor room, meta pain 2023-06-08 23:29:25 -07:00
UFFR
30dee77dae
🅱️esh gaming
The ultimate alloy
2023-06-08 20:08:15 -04:00
Bob
4846313b06 can't forget this thing 2023-06-08 22:32:27 +02:00
Bob
9e8221feef rail ramps, some performance stuff, fixes 2023-06-08 21:58:09 +02:00
HbmMods
89c6c799c0
Merge pull request #1058 from UFFR/euph_capacitor
Euphemium capacitor lmao
2023-06-08 16:52:34 +02:00
HbmMods
ed4ad2aed0
Merge pull request #1057 from Doctor17-git/master
Updated ru_RU.lang
2023-06-08 16:52:25 +02:00
Bob
447cb061f2 artillery gas shells 2023-06-08 16:51:54 +02:00
UFFR
1c27afbd73
Euphemium capacitor lmao
Finally added it as it's own thing.
Hopefully has a reasonable recipe.
2023-06-07 18:10:01 -04:00
Doctor17-git
b08a2bd6b7
Updated ru_RU.lang
updated russian localization
2023-06-07 18:03:24 +03:00
Boblet
1a9da01d74 pollution stuff 2023-06-07 16:36:26 +02:00
Bob
4fb8eb9960 minor fixes 2023-06-06 23:01:51 +02:00
Boblet
32ae24823a soot fog, hostile mob buffs, tiny mass storage, comparator output 2023-06-06 15:26:36 +02:00
Bob
72078d6b03 better safe than sorry 2023-06-05 21:58:16 +02:00
HbmMods
33005a0a18
Merge pull request #1050 from burningwater202/burningwater202
Sorry for being a pane
2023-06-05 21:51:16 +02:00
Bob
41444173d2 fixed liquefactor being stupid 2023-06-05 21:50:45 +02:00
HbmMods
bd7693474d
Update .gitignore 2023-06-05 21:50:33 +02:00
Boblet
685412473e fixes, some more pollution stuff 2023-06-05 16:39:05 +02:00
Bob
ff473c51da redid most train physics, pollution handling stuff 2023-06-04 17:08:11 +02:00
burningwater202
df830d9612 :letsfuckingGOOOOO:
Y'know I'm a bit of a pane in the glass
2023-06-03 13:19:50 -04:00
Boblet
2d3217c96b block remapping, steel alloy blocks, osmiridium cast plates 2023-06-02 14:22:29 +02:00
burningwater202
b6212b6110 god I wish it were me
Glass panes (I'm in pane)
2023-06-01 21:51:09 -04:00
Bob
b9d159bffe chlorocalcite 2023-06-01 19:07:21 +02:00
Boblet
de10c15ea6 more rail logic, straight standard gauge model 2023-06-01 16:19:33 +02:00
Vaern
7ed32a6c7f a 2023-05-31 20:08:36 -07:00
Bob
46da9272d1 assets 2023-05-31 22:10:51 +02:00
Boblet
36d4a4c4e0 some more train stuff 2023-05-31 16:31:54 +02:00
Boblet
ccce86a41c usable tram trailer 2023-05-31 15:18:16 +02:00
Vaern
af695359b3 small fix 2023-05-30 20:52:47 -07:00
Vaern
f4d67be51e deco 2023-05-30 20:04:55 -07:00
Boblet
a9af4fa277 changelog 2023-05-30 14:56:10 +02:00
HbmMods
be36bbf25f
Merge pull request #1043 from Toshayo/master
Added CurseForge task configuration
2023-05-30 14:44:42 +02:00
HbmMods
7db7e246f2
Merge pull request #1041 from burningwater202/burningwater202
Burningwater202
2023-05-30 14:41:29 +02:00
HbmMods
d50506ce13
Update en_US.lang 2023-05-30 14:40:48 +02:00
HbmMods
404aacc32b
Delete ExampleMod.java 2023-05-30 14:39:24 +02:00
Vaern
cd4c976dd7 Preliminary BunkerComponents 2023-05-29 20:37:34 -07:00
Bob
87a87738ba train coupling, pulling physics 2023-05-29 16:50:51 +02:00
HbmMods
428dce6a23
Merge pull request #1046 from Doctor17-git/master
Updated ru_RU.lang
2023-05-28 23:00:20 +02:00
Doctor17-git
7fa942dde3
Updated ru_RU.lang
updated russian localization
2023-05-28 23:58:45 +03:00
Bob
727a158ed1 bauxite, achievement stuff, fixes 2023-05-28 21:53:58 +02:00
Bob
e120654403 more train coupling stuff 2023-05-27 23:38:15 +02:00
Toshayo
e20c4f1611
Update .gitignore
Newlines are good
2023-05-26 18:26:43 +02:00
Toshayo
68354bd6f3
Added CurseForge task configuration 2023-05-26 18:15:13 +02:00
Boblet
85ce4008a1 train coupling (physics pending) 2023-05-26 14:54:57 +02:00
burningwater202
3085b3c7dc Fork me in the glass
I have no idea what I'm doing
2023-05-25 21:38:49 -04:00
burningwater202
2512ed9151 Laminate Glass (real)
At long last.
Adds:
Laminate Glass
Recipe is 250mb BTX + 250mb Phosgene + 4 Tungsten Bolts + 1 Reinforced Glass

Will add later:
-Laminate Panes
-3 to 4 cracked laminate types (meta)
2023-05-25 21:37:41 -04:00
Boblet
6898cdb09e preparation for train coupling 2023-05-25 16:01:00 +02:00
Bob
9a1d7c76e8 some fixes, tram flatbed wagon 2023-05-24 21:46:26 +02:00
Boblet
8c5544c9f2 buoyant items, press fix 2023-05-24 16:13:14 +02:00
Boblet
305b7232f2 Blast fishing, fish bombing, dynamite fishing or grenade fishing is a de
structive fishing practice using explosives to stun or kill schools of fish for easy collection.
2023-05-24 14:35:43 +02:00
Bob
be5c4ba9d6 fish oil, some experimental mixer stuff 2023-05-23 21:54:10 +02:00
Boblet
7d49108c95 some model garbage 2023-05-23 16:33:16 +02:00
Bob
e269653c69 fixed none keybind 2023-05-22 18:59:22 +02:00
Boblet
7ecc3fb1b7 fixes, cryo cannon UV 2023-05-22 16:48:51 +02:00
Vaern
705f051c50 Phosphor vines 2023-05-21 16:37:44 -07:00
Bob
7acf23b2aa ow my balls 2023-05-21 22:51:04 +02:00
HbmMods
34db714565
Merge pull request #1035 from Doctor17-git/master
Updated ru_RU.lang
2023-05-21 20:16:49 +02:00
Doctor17-git
7b0f648804
Updated ru_RU.lang
updated russian localization
2023-05-21 20:51:16 +03:00
Bob
ecedb95d58 new concrete, sound fixes, additions, slag tap 2023-05-21 19:44:35 +02:00
Bob
f2574fc232 black lung balance, tram tooltip 2023-05-20 23:30:13 +02:00
Boblet
17eb7b7eb2 cryo cannon UV template 2023-05-19 14:36:48 +02:00
Bob
830f0e5162 fixed trains nor consuming fuel, some model stuff 2023-05-18 22:05:22 +02:00
HbmMods
1df34a3fa3
Merge pull request #1033 from Vaern/master
Pile time
2023-05-17 18:27:48 +02:00
Vaern
9ce84ac921 whooooops 2023-05-17 07:58:43 -07:00
Vaern
b68b83e2e2 Finishing touches
i mean i think that's everything?
2023-05-17 07:47:32 -07:00
Boblet
c58b456adb electric train class 2023-05-17 14:13:56 +02:00
Vaern
d871e46b9f Fixes o'plenty, nearing completion 2023-05-16 19:58:15 -07:00
Vaern
5f27a78bcb Fixed piston display, fixed critical issue, added comparator output
still need fixes
2023-05-16 15:09:11 -07:00
Boblet
e6bb2233fa usable train GUI 2023-05-16 15:13:20 +02:00
Boblet
78cbce7a36 some untested turret compat stuff 2023-05-16 11:21:30 +02:00
Vaern
2ea60eae13 Fixes! 2023-05-15 22:52:32 -07:00
Vaern
230ff00257 Piston inserter fixed, some crucial bug fixes in the pile insertion 2023-05-15 19:46:19 -07:00
Bob
1005eee31c bronk 2023-05-15 23:12:50 +02:00
HbmMods
e63996f9f2
Update README.md 2023-05-15 16:24:19 +02:00
Boblet
b04a25ad71 i can't feel my legs no more 2023-05-15 16:21:36 +02:00
Boblet
7fe0a11388 the malicious gigglefish from the silly dimension 2023-05-15 14:58:30 +02:00
Vaern
5c36e1aa04 piston inserter 2023-05-14 22:22:45 -07:00
Bob
222f81191e compressor stuff 2023-05-14 22:29:27 +02:00
Vaern
3fde052e09 Merge remote-tracking branch 'HbmMods/master' 2023-05-14 09:16:16 -07:00
Bob
a71d7972ec fluid pressure stat 2023-05-14 17:51:35 +02:00
Bob
d8e87453cb fixed tain bounding boxes not properly initializing 2023-05-14 14:29:11 +02:00
Vaern
f52eb08301 :3
Added IBlowable for fan; created TE for a piston-based inserter (IInsertable). The former will improve cooling for pile setups and the latter will allow for automation, in combination with comparator output for pile fuel.
2023-05-13 22:34:48 -07:00
Boblet
b8f32a511b train collision dummies 2023-05-12 14:35:06 +02:00
Bob
c7f28e8853 compressor model 2023-05-11 23:37:31 +02:00
Boblet
a397490424 power net tracker, fensu fix, dueterium tower rebalance 2023-05-11 16:55:07 +02:00
Boblet
3a4bf04aec crate drop bug, comparator output 2023-05-11 10:41:46 +02:00
Boblet
dcec262717 train bounding box, fixes 2023-05-10 16:51:42 +02:00
Bob
adc651eecc aesthetically prodigious train man 2023-05-09 22:52:17 +02:00
HbmMods
a2ab196378
Merge pull request #1009 from sdddddf80/zh_CN.lang
Update zh_CN.lang
2023-05-09 16:47:26 +02:00
HbmMods
ff1c40fda1
Merge branch 'master' into zh_CN.lang 2023-05-09 16:47:19 +02:00
Boblet
9d16e1fddf shithub is down and GK keeps swallowing my commits 2023-05-09 14:25:10 +02:00
Boblet
fada68fb89 come on shitkraken do the thing 2023-05-09 14:12:48 +02:00
Boblet
6d5e5ddc6d fixed mojang's weird input restrictions, more tram stuff 2023-05-09 13:58:17 +02:00
Bob
73911abbd6 biblically accurate tram model 2023-05-08 23:52:09 +02:00
Boblet
015ee2245a inventories for trains 2023-05-08 16:16:59 +02:00
HbmMods
40d2a3de27
Merge pull request #1024 from Doctor17-git/master
Updated ru_RU.lang
2023-05-07 20:53:14 +02:00
Doctor17-git
bea23315bf
Updated ru_RU.lang
updated russian localization
2023-05-07 21:41:13 +03:00
Bob
73367570b8 tram passenger seats 2023-05-07 20:30:54 +02:00
Bob
bfb1334b49 random shit, go! 2023-05-07 01:36:59 +02:00
Bob
c0488324b0 oh HELL yeah 2023-05-06 14:44:11 +02:00
Bob
a558b1d83b straightened the straights, rail debugger 2023-05-06 12:43:32 +02:00
Bob
4433726af2 i fixed it and now it works even less 2023-05-05 23:25:12 +02:00
Boblet
c67bb8ad3a i am in spain without the s 2023-05-05 14:39:34 +02:00
HbmMods
b38a7daafd
Merge pull request #1017 from BallOfEnergy1/master
Added more Opencomputers compatibility
2023-05-04 13:20:39 +02:00
Boblet
3983285c28 a curve that doesn't actually curve 2023-05-04 13:08:37 +02:00
BallOfEnergy
13e534be65 Fixed some dumb compatibility issues in the fluid tanks 2023-05-03 21:02:55 -05:00
BallOfEnergy
1a8d937f03 added accelerated compatibility to other components such as the DFC and batteries, also added some highly requested compatibility to fluid tanks. 2023-05-03 20:17:10 -05:00
BallOfEnergy
76756f02e8
intellij being dumb and not seeing files moment 2023-05-03 19:28:46 -05:00
BallOfEnergy
907ab2f7b4
fixing the texture because it wants to be crappy 2023-05-03 19:20:24 -05:00
BallOfEnergy
abb9cbc980
Merge branch 'HbmMods:master' into master 2023-05-03 19:15:16 -05:00
Bob
abc4dc0cbf tram trom 2023-05-03 23:10:28 +02:00
Boblet
ec63136436 the black mesa rail network 2023-05-03 14:15:16 +02:00
Boblet
dd2f929821 EntityRailCarBase 2023-05-03 10:42:58 +02:00
BallOfEnergy
02f89cc0c8 my own bobble :D 2023-05-02 21:55:31 -05:00
Boblet
b6ae5565bd on a rail 2023-05-02 16:40:26 +02:00
Bob
cf533339f5 fixed tau damage, fluid bucket registry 2023-05-01 22:47:20 +02:00
sdddddf80
7356f6c366 Update zh_CN.lang 2023-05-01 15:47:05 +08:00
sdddddf80
d011a940c0 Update zh_CN.lang 2023-05-01 10:11:40 +08:00
HbmMods
1b66d13611
Merge pull request #990 from BallOfEnergy1/master
Added OC compatibility
2023-04-30 22:22:58 +02:00
HbmMods
7a385a5824
Merge pull request #1014 from Doctor17-git/master
Updated ru_RU.lang
2023-04-30 22:19:47 +02:00
Doctor17-git
fe7ca86b46
Updated ru_RU.lang
updated russian localization
2023-04-30 18:45:54 +03:00
Bob
30e2fef6b8 finished coker, tau remodel, biden blast 2023-04-30 17:03:33 +02:00
Bob
ba3a0a1669 coker texture, rendering, energy fix 2023-04-29 19:00:01 +02:00
Bob
750500a8e1 fjixes 2023-04-28 00:17:07 +02:00
Bob
aadd7c548d fluid port fixes 2023-04-26 23:24:03 +02:00
Boblet
6e8e8cb9c5 coker functionality 2023-04-26 16:18:33 +02:00
Boblet
a0cb8aedd8 C18H24O2 2023-04-26 10:55:11 +02:00
Bob
ac4ebfc72f chinese localization, coker model 2023-04-25 23:27:54 +02:00
Boblet
5644726060 coker recipes 2023-04-25 14:50:42 +02:00
BallOfEnergy
303799a203
Merge branch 'HbmMods:master' into master 2023-04-24 20:03:09 -05:00
BallOfEnergy
0c36464cd8 Scratch that last idea, crappy concept and can be implemented in literally a few lines 2023-04-24 20:02:40 -05:00
Boblet
b276b0167f coker 2023-04-24 16:11:57 +02:00
sdddddf80
abc0563522 Update zh_CN.lang 2023-04-24 11:29:57 +08:00
HbmMods
628ae3fab6
Merge pull request #1006 from Doctor17-git/master
Updated ru_RU.lang
2023-04-23 22:09:23 +02:00
Doctor17-git
5219eb0838
Updated ru_RU.lang 2023-04-23 23:08:15 +03:00
Bob
d0854bb795 oh yeah 2023-04-23 22:00:59 +02:00
Bob
43c43eb14f watz fuel stats, more construction recipes 2023-04-22 16:00:07 +02:00
Doctor17-git
eb0e8d08a5
Merge branch 'HbmMods:master' into master 2023-04-21 15:57:11 +03:00
Boblet
8ec678564f multiblock construction NEI handler (wow!), better bolting 2023-04-21 14:39:33 +02:00
Boblet
ed829fc7ec riveting, block tooling crafting handler 2023-04-20 16:41:17 +02:00
BallOfEnergy
095d50e611 Merge remote-tracking branch 'origin/master' 2023-04-19 21:48:26 -05:00
BallOfEnergy
abbd13278e
Merge branch 'BallOfEnergy1-OC-Test-1' into master 2023-04-19 21:46:49 -05:00
BallOfEnergy
edfa10ed0c
Merge branch 'HbmMods:master' into master 2023-04-19 21:42:23 -05:00
BallOfEnergy
242ee0d6e1
Merge branch 'HbmMods:master' into BallOfEnergy1-OC-Test-1 2023-04-19 21:42:07 -05:00
BallOfEnergy
32fade1180 first test of the new RBMK card component shiz 2023-04-19 21:40:18 -05:00
Bob
ce5435f07d mist 2023-04-19 22:18:06 +02:00
Boblet
c76267ebd1 faster cracking, more gas funnies 2023-04-19 16:17:48 +02:00
Boblet
b86801dd14 access transformer, creeper fun 2023-04-19 11:07:47 +02:00
BallOfEnergy
5f27c39094 yep that's a lot of files 2023-04-18 20:49:56 -05:00
BallOfEnergy
b2b8466f50
Merge branch 'HbmMods:master' into master 2023-04-18 20:41:17 -05:00
Boblet
68d28a214e more gas funnies 2023-04-18 16:50:00 +02:00
Boblet
971ba04d24 funny toxic fluids 2023-04-17 14:45:54 +02:00
Boblet
8574e86fdc uraninite
changes uranium into uraninite if GT6 is installed, should hopefully fix some isotope oddities
2023-04-17 07:56:56 +02:00
Bob
cc2833098f bolt gun 2023-04-16 21:28:45 +02:00
Doctor17-git
169265e8a1
Merge branch 'HbmMods:master' into master 2023-04-16 09:50:47 +03:00
Bob
ba02c7fa9e watz fixes, most remaining functionality, NBT and IO 2023-04-15 17:46:50 +02:00
Boblet
8f20e77338 some gas stuff 2023-04-13 16:23:23 +02:00
Boblet
e138ff8b96 watz core component functionality 2023-04-12 16:52:30 +02:00
Bob
5246b7fad1 watz core block, better hologram rendering 2023-04-11 21:42:24 +02:00
Boblet
2debe1a0bf recipes 2023-04-11 16:49:36 +02:00
Doctor17-git
57eb24ad9c
Merge branch 'HbmMods:master' into master 2023-04-07 20:11:01 +03:00
Bob
35aeb3647f and there's that 2023-04-07 18:48:11 +02:00
HbmMods
7b79115035
Merge pull request #994 from HbmMods/pr993
Pr993
2023-04-07 18:44:04 +02:00
Bob
421b88b35f huhh 2023-04-07 18:41:16 +02:00
Doctor17-git
43f3d0115c
Merge branch 'HbmMods:master' into master 2023-04-07 19:21:52 +03:00
HbmMods
7688d39019
Merge pull request #993 from Doctor17-git/master
Particle emitter
2023-04-07 18:18:24 +02:00
Bob
eef035186a fixes 2023-04-07 18:17:03 +02:00
Doctor17-git
9eee192126 oops 2023-04-07 18:45:24 +03:00
Doctor17-git
f224923a82 part emitt 2023-04-07 18:33:48 +03:00
HbmMods
4e80951d54
Merge pull request #991 from Doctor17-git/master
Updated ru_RU.lang
2023-04-06 22:19:54 +02:00
Doctor17-git
07953939c8
Updated ru_RU.lang
updated russian localization
2023-04-06 23:18:30 +03:00
Bob
f9b6425400 and all that 2023-04-06 21:33:47 +02:00
Boblet
0146c009e7 diode and schrabidate blindness fix 2023-04-06 16:59:37 +02:00
BallOfEnergy
32f0888aec
fixed a small OC bug
yeah idk should be ready for merging to main mod
2023-04-06 09:35:19 -05:00
BallOfEnergy
aec7c58141
Merge branch 'HbmMods:master' into master 2023-04-06 09:17:16 -05:00
Boblet
29176d0e82 some fixes, watz pellets 2023-04-05 16:44:14 +02:00
Boblet
8244747692 compat recipes, watz pump functionality, IO filter 2023-04-04 16:28:21 +02:00
Bob
a33abf85ea watz pressure pump 2023-04-03 22:08:15 +02:00
Bob
029c2f226f lead poisoning, brain no work :( 2023-04-03 20:38:30 +02:00
Boblet
0135b66884 more intuitive mixer recipe setting, particle sys crap 2023-04-03 16:21:13 +02:00
BallOfEnergy
70397b418d
yeah uh redoing OC compat
yeah it should work now idk
2023-04-03 09:01:56 -05:00
BallOfEnergy
8259c17e68
Merge pull request #1 from BallOfEnergy1/BallOfEnergy1-OC-Test-1
ok yeah it works well enough to do the job
2023-04-03 08:56:52 -05:00
Bob
da1b4b24f1 broadened stat reregistering exception ignoring scope, meteorite gen fix 2023-04-02 20:54:48 +02:00
HbmMods
92bed8ae6c
Merge pull request #982 from TehTemmie/master
Small fixes
2023-04-02 20:32:45 +02:00
Bob
c7e3f3bb42 yeah whatever this is 2023-04-02 20:30:22 +02:00
TehTemmie
3bf082a64c
Update ItemRBMKRod.java
Prevents RBMK temperature from skyrocketing to infinity when DisableMeltdowns is enabled by
2023-04-01 22:23:23 +08:00
TehTemmie
a18820e4b5
Parentheses fix #69420 2023-04-01 22:17:36 +08:00
Boblet
b82597c0e3 splitter textures, conveyor grabber 2023-03-31 15:15:11 +02:00
BallOfEnergy
a754032841 Merge remote-tracking branch 'origin/master' 2023-03-30 16:52:57 -05:00
BallOfEnergy
9b449899fb
testing rod names 2023-03-30 09:40:16 -05:00
BallOfEnergy
183fb61cd1
Merge branch 'HbmMods:master' into BallOfEnergy1-OC-Test-1 2023-03-30 09:27:54 -05:00
Bob
5cc6621b94 conveyor splitter 2023-03-29 22:59:24 +02:00
BallOfEnergy
59948c06ed
Merge branch 'HbmMods:master' into BallOfEnergy1-OC-Test-1 2023-03-29 09:13:43 -05:00
Boblet
cd319ef44d experimental particle crap, watz item IO 2023-03-28 16:54:15 +02:00
BallOfEnergy
9d23c8a057
Update TileEntityRBMKRod.java 2023-03-28 09:20:57 -05:00
Bob
1cf051a8b1 ough 2023-03-27 21:47:01 +02:00
Boblet
f0fe4119f5 watz pellet depletion 2023-03-27 16:32:23 +02:00
HbmMods
a85b564211
Merge pull request #971 from Doctor17-git/master
Updated ru_RU.lang
2023-03-26 18:04:18 +02:00
Doctor17-git
19618ee1fa
Updated ru_RU.lang 2023-03-26 17:17:46 +03:00
Bob
7c2e8e27cf she ate 16 tons of coal and died </3 2023-03-26 15:53:22 +02:00
Bob
984338bd7d some tweaks, fans 2023-03-25 22:47:49 +01:00
Bob
668b3be77c funny miner's helmet with headlamp 2023-03-25 00:37:14 +01:00
Bob
d787a9835c little diesel guy 2023-03-24 20:34:17 +01:00
Boblet
295d4c489a watz fluid IO 2023-03-24 15:18:10 +01:00
Bob
0a2edf189d watz tank sharing, missinng mutable texture crash fix 2023-03-23 23:10:32 +01:00
Boblet
4d1e902981 small fixes, watz heat/flux functionality 2023-03-23 16:04:10 +01:00
Bob
1901eb317a watz GUI stuff 2023-03-22 21:02:27 +01:00
Boblet
a6913160e0 killed mud tank, some math stuff 2023-03-22 16:36:06 +01:00
Bob
3453929d86 fixes 2023-03-21 21:48:52 +01:00
Boblet
11125a50e0 big pew pew 2023-03-21 16:18:15 +01:00
Bob
22e96fefd4 inventory proxy for blast furnace extension, cast metal sploosh particle 2023-03-20 21:12:52 +01:00
Boblet
f52dbbec35 ionic gel, blast furnace extension 2023-03-20 15:40:10 +01:00
Boblet
109b6714a8 fixed forge's broken ass item stats 2023-03-20 10:59:12 +01:00
Bob
2c0c57d174 ow 2023-03-19 22:03:29 +01:00
HbmMods
8d7046dac3
Merge pull request #962 from Doctor17-git/master
Updated ru_RU.lang
2023-03-19 17:05:24 +01:00
Doctor17-git
9f4a5ea360
Updated ru_RU.lang 2023-03-19 19:04:19 +03:00
Bob
b844adff44 fixes, some recipes 2023-03-19 16:51:09 +01:00
Bob
9145ac6e6d funny flowers 2023-03-18 22:09:14 +01:00
Doctor17-git
7ea0fe4f96
Updated ru_RU.lang 2023-03-18 11:38:27 +03:00
Boblet
b762d23a2a dynamic gas tanks, removed some old assets, recipes 2023-03-17 15:18:29 +01:00
HbmMods
bab2fbc211
Merge pull request #953 from BallOfEnergy1/master
Added OC compatibility
2023-03-17 07:52:09 +01:00
BallOfEnergy1
3e893cfff4 Merge remote-tracking branch 'origin/master' 2023-03-16 16:50:58 -05:00
BallOfEnergy1
54be75f71f Finished up most OC compatibility, tested and ready for merge. 2023-03-16 16:50:49 -05:00
BallOfEnergy
fb1ead6666
Merge branch 'HbmMods:master' into master 2023-03-16 16:40:49 -05:00
Bob
b0c757b09b funny gas recipes 2023-03-16 22:10:04 +01:00
Boblet
0b44f401a1 recipes, duct autoconversion, colloid, funny gas 2023-03-16 16:48:34 +01:00
BallOfEnergy1
8a57f66fa8 Merge remote-tracking branch 'origin/master' 2023-03-15 17:51:35 -05:00
BallOfEnergy1
6a52f65a53 Added the ability to change/read the steam type to and from the RBMK boiler columns. 2023-03-15 17:51:29 -05:00
BallOfEnergy
5792ec8b5e
Merge branch 'HbmMods:master' into master 2023-03-15 17:43:37 -05:00
BallOfEnergy1
132240bc03 Merge remote-tracking branch 'origin/master' 2023-03-15 17:29:23 -05:00
BallOfEnergy1
3b564d5f92 Fixed some crucial issues with the heater OC compatibility, along with some added functionality for detecting core and skin heat of rods in the RBMK fuel columns. 2023-03-15 17:29:16 -05:00
Bob
bd3bbb4395 recipes, rocket fixes 2023-03-15 22:33:10 +01:00
BallOfEnergy
765384d0a3
Merge branch 'HbmMods:master' into master 2023-03-15 13:15:40 -05:00
Boblet
abbb67c940 rawketts 2023-03-15 17:00:24 +01:00
BallOfEnergy1
82cd509ec3 Merge remote-tracking branch 'origin/master' 2023-03-14 17:13:14 -05:00
BallOfEnergy1
a2b798c1e2 Added a bit more OC compat, along with individual OC fields for grabbing singular fields. 2023-03-14 17:12:56 -05:00
BallOfEnergy
51a53108f7
Merge branch 'HbmMods:master' into master 2023-03-14 15:49:38 -05:00
BallOfEnergy1
edb94e966f Revamped some Opencomputers stuff 2023-03-14 15:48:45 -05:00
Bob
a5ae8583d4 small tweaks, item grate 2023-03-14 20:36:59 +01:00
Boblet
ce0b31d536 fixed scrap color, more material color definitions 2023-03-14 13:21:17 +01:00
Boblet
2327746e5a holy FUCK 2023-03-14 11:00:25 +01:00
Bob
8ad9004179 wobbly autosaw engine, tintable icons that don't suck ass 2023-03-13 22:27:50 +01:00
Boblet
4a4927271e cast plates for most 528 recipes, better mat autogen, icon funnies 2023-03-13 16:52:43 +01:00
Bob
43ab1f3134 i'm stealing your catalytic converter so i can sell it to buy crack.
please don't ask such feeble-minded questions. it's rude.
2023-03-12 19:31:56 +01:00
Bob
e7f0dc610b recipes and textures for vacuum oil products 2023-03-09 21:52:33 +01:00
Boblet
b85a9ad6cf funny fluids 2023-03-09 16:47:32 +01:00
Bob
503fc11177 reforming recipes, catalytic reformer functionality 2023-03-08 22:22:11 +01:00
Boblet
ef590afe30 recipe configs, tank textures, persistent NBT, cleanup 2023-03-08 16:14:50 +01:00
Bob
8b2a530c16 some more catalytic reformer work 2023-03-07 23:12:15 +01:00
Boblet
b5f80f96f1 Merge remote-tracking branch 'origin/master' 2023-03-07 16:24:49 +01:00
Boblet
c4e350ff92 extinguishable tanks, refinery recipes, NEI handlers 2023-03-07 16:24:39 +01:00
Bob
68393dda9e catalytic reformer GUI 2023-03-06 21:11:09 +01:00
Boblet
469a624966 more oil recipes, detectable bedrock ores 2023-03-06 16:13:07 +01:00
Bob
0df987b689 finished vacuum refinery, more oils 2023-03-05 18:37:23 +01:00
Bob
cd3dce4350 vacuum distill GUI 2023-03-04 22:22:32 +01:00
Bob
6f2b9656fc the press unshittening: part 2 2023-03-04 18:41:44 +01:00
Bob
cf62bc82e0 unshitted the burner press 2023-03-03 23:29:20 +01:00
Boblet
c94c29874f some more tests 2023-03-03 15:03:02 +01:00
HbmMods
d2270abf60
Merge pull request #932 from Doctor17-git/master
Updated ru_RU.lang
2023-03-02 21:16:25 +01:00
Bob
6538b34d70 oil 3 inbound 2023-03-02 21:15:07 +01:00
Doctor17-git
d65fe9d8de
Updated ru_RU.lang
updated russian localization
2023-03-02 17:47:03 +03:00
Boblet
c775bb7803 re-did mini nuke code, cleaned up unused imports 2023-03-02 09:54:03 +01:00
Bob
6a19508681 tier 3 bedrock processing, woooo 2023-03-01 21:28:13 +01:00
Boblet
fc531e1c60 it's everyone's favorite 2023-03-01 16:43:43 +01:00
Boblet
a22c8284ee irradiation column NEI handler, config, high-perf solvent, petroleum wax 2023-02-28 13:36:12 +01:00
HbmMods
0d25949106
Merge pull request #930 from Doctor17-git/master
Updated ru_RU.lang
2023-02-26 21:56:23 +01:00
Doctor17-git
6a523e98cc
Updated ru_RU.lang
updated russian localization
2023-02-26 23:41:50 +03:00
Bob
0eb25c418d blast furnace recipe configs, fixes, scrollable anvil item list 2023-02-26 21:37:07 +01:00
Bob
af1a5d37ce fixes, chainsawable leaves 2023-02-25 20:00:31 +01:00
Boblet
c375ea54bd Merge remote-tracking branch 'origin/master' 2023-02-24 14:57:08 +01:00
Boblet
dedd3a22a2 the recipening, killed lead revolver, .357 bullet compatibility 2023-02-24 14:57:00 +01:00
Bob
48fbc683af whatever 2023-02-23 21:41:50 +01:00
HbmMods
7d50f47ad5
Merge pull request #921 from Vaern/main
The Lord's Will be done
2023-02-23 19:27:20 +01:00
Vaern
88cdc7919c
Merge branch 'master' into main 2023-02-23 10:08:09 -08:00
Vaern
204b94cf60 JUDGEMENT! 2023-02-23 10:05:50 -08:00
Vaern
77cc85efe1 CRUSH! 2023-02-23 10:02:41 -08:00
HbmMods
9547e5acec
Merge pull request #920 from Vaern/master
Moved ZIRNOX rods over to ItemEnumMulti
2023-02-23 08:42:48 +01:00
Vaern
905fe32d22 And thy punishment...
is death!
2023-02-22 21:19:07 -08:00
Vaern
be10276e18 i'm not gonna sugarcoat it
https://youtu.be/E-54I6loV40?t=266
2023-02-22 19:41:11 -08:00
Bob
202620c73a NBT pain 2023-02-21 20:01:26 +01:00
Boblet
cfa87c084c fix, nix, nyx, dyx 2023-02-21 16:45:59 +01:00
Boblet
a7e51e6059 radioactive crates, containment box 2023-02-21 13:14:58 +01:00
HbmMods
dbe2b1fcc9
Merge pull request #917 from Doctor17-git/master
Updated ru_RU.lang
2023-02-19 20:53:17 +01:00
Doctor17-git
fc4352af4c
Updated ru_RU.lang 2023-02-19 22:48:47 +03:00
Bob
1dc976d337 i didn't expect this to be done in time tbh 2023-02-19 20:40:08 +01:00
Doctor17-git
17efb82abf
Updated ru_RU.lang 2023-02-18 13:33:56 +03:00
Bob
2b7a8f7d0f yummy crayons 2023-02-17 23:30:39 +01:00
Boblet
6b23588aa7 and now for something completely different 2023-02-17 14:51:35 +01:00
Bob
7b8c87478a ...and nobody could tell the difference, nothing of value was lost 2023-02-16 21:58:54 +01:00
Boblet
fe48a47c95 two-smack jack's signature weapon 2023-02-16 16:53:19 +01:00
HbmMods
69fc93a432
Merge pull request #914 from Vaern/ace-combat-zero-reference
ace combat zero reference
2023-02-16 09:07:48 +01:00
Vaern
5f07bb7896 ace combat zero reference 2023-02-15 14:40:57 -08:00
Bob
f5ceaddfbb explodable refinery yeah 2023-02-15 22:21:20 +01:00
Vaern
a4b067616a fixes 2023-02-15 11:28:43 -08:00
Vaern
0cfcbf1a97 zox rod changes
untested
2023-02-15 09:24:04 -08:00
Boblet
344dd55dfa turbine temperature tweaks 2023-02-15 16:55:06 +01:00
Boblet
90b7ee2ab7 syngas, oxyhydrogen 2023-02-15 16:10:36 +01:00
Vaern
7a4cad0923 Moved ZIRNOX rods to itemenummulti fully
the lord is my shepherd; i shall not want
2023-02-14 23:00:22 -08:00
Vaern
54a2855efa expectation management
wowwe, the wastes were getting a bit too spaghetti for my liking
2023-02-14 22:39:35 -08:00
Vaern
0af3e1eac6 better name :3 2023-02-14 17:50:51 -08:00
Vaern
8b2a304e62 start of moving zirnox, other rods to enummulti 2023-02-14 15:04:53 -08:00
Bob
9dc3061160 cancelable shotgun reloads, more recipe configs 2023-02-14 22:28:33 +01:00
Bob
84c28767db loud man johnson 2023-02-13 22:41:35 +01:00
Boblet
ab9fc80e74 gas turbine time 2023-02-13 16:20:15 +01:00
HbmMods
2f48734562
Merge pull request #912 from Vaern/master
Moved canned conserves over to ItemEnumMulti
2023-02-13 10:29:40 +01:00
Vaern
c2c60388a3 Moved canned conserves over to ItemEnumMulti 2023-02-12 14:42:37 -08:00
Bob
84d5dcb3a6 fissures 2023-02-12 20:42:33 +01:00
Boblet
9242c79ee3 the w 2023-02-10 13:01:09 +01:00
Bob
c9172c5cf8 mimimimimi 2023-02-09 22:43:05 +01:00
Boblet
3ce962018d fixed diodes voiding energy, fixed side restriction confusion 2023-02-09 13:06:07 +01:00
Bob
0e334262ac chemplant recipe localization, some model crap 2023-02-08 23:10:56 +01:00
Boblet
c1decc5162 recipes for new acids, acid mixing 2023-02-08 15:14:28 +01:00
HbmMods
c92b0e3e60
Merge pull request #907 from Doctor17-git/master
Updated ru_RU.lang
2023-02-08 14:35:12 +01:00
Doctor17-git
97c12d021c
Updated ru_RU.lang
updated russian localization
2023-02-08 15:34:31 +03:00
Bob
2b63226bfc fixed acidizer not differentiating recipes by acid type 2023-02-07 22:10:56 +01:00
Boblet
3192331173 blood floats on blood, nitric acid ore processing chain 2023-02-07 15:37:48 +01:00
Boblet
1ef48ead18 more drill bits, acids, bedrock processing, yeeted unused GUIs 2023-02-06 14:30:52 +01:00
HbmMods
5a1fa78350
Merge pull request #885 from Voxelstice/its-oc-again
Some more changes with OpenComputers integration
2023-02-06 08:31:19 +01:00
Boblet
c63cb8b6db a little bit more ore dict 2023-02-06 08:05:44 +01:00
HbmMods
2b00ab2c72
Merge pull request #857 from Vaern/master
Removed schrab & cmb stamps / blades, moved desh tier to actually desh
2023-02-06 08:02:42 +01:00
HbmMods
dac27bbfb3
Merge branch 'master' into master 2023-02-06 08:02:31 +01:00
Boblet
0ddab908f8 post-merge cleanup 2023-02-06 07:59:34 +01:00
HbmMods
e37f2c819f
Merge pull request #897 from martemen/GradleFix
Issue #895: Gradle fix
2023-02-06 07:53:51 +01:00
HbmMods
0e3b6b343e
Merge branch 'master' into GradleFix 2023-02-06 07:53:06 +01:00
Bob
ac5a661c67 maybe crashing servers instantly shouldn't be a feature 2023-02-05 19:35:13 +01:00
Bob
fdd9952fef and that's all, folks 2023-02-05 19:28:53 +01:00
HbmMods
c64e93c9c9
Merge pull request #905 from HbmMods/m763
*mwah*
2023-02-05 18:57:45 +01:00
Bob
613feaecea can you fuck off 2023-02-05 18:41:43 +01:00
Bob
6305395aaa fixes, tweaks, quesadillas 2023-02-05 18:40:25 +01:00
Bob
68eef7bc08 casing delays for handheld guns, casing smoke, bugfixes 2023-02-04 21:26:39 +01:00
Bob
00e8675a15 spent casings for turrets, finished 12ga percussive caps 2023-02-04 15:28:24 +01:00
Boblet
5075f28bc2 12 gauge percussive cap, casing spawner for turrets 2023-02-03 15:06:05 +01:00
Bob
f631ec0e9c fixed test scope for lil'pip, even more-er casings 2023-02-02 21:06:52 +01:00
Boblet
52243eb77c nails with heads 2023-02-02 16:44:38 +01:00
Bob
a12cbfb6fc more casings, fixed chlorophyte casing color 2023-02-01 22:06:35 +01:00
Grumpyaaa
81fe902092
Gradle properties, all credits go to @Toshayo 2023-02-01 17:52:04 +02:00
Boblet
1e1e2a51c9 honestly quite incredible 2023-02-01 14:00:19 +01:00
Bob
e7a9fac26c colorful casings, more casing configs 2023-01-31 21:52:16 +01:00
Boblet
d6b0d5b9ca split ejector and casing configs, casing colors 2023-01-31 13:24:52 +01:00
Bob
b0bf2b6511 SPAS spent shells, fixed lighting and wobblyness 2023-01-30 20:49:41 +01:00
Bob
917e842efc solved the mystery of the wacky wobbling particles
layer 3 particles move weirdly if the player moves, that is due to some render context vars are not properly set up when layer 3 renders (before layers 0-2 in fact), so simply providing the values manually solves the wobblyness
2023-01-29 22:30:03 +01:00
Bob
89e48bb990 higher 5mm recipe yield, fixed ammo sync vals shifitng, new 5mm textures 2023-01-29 17:47:30 +01:00
Bob
128c147b69 it's incredible how easy it is 2023-01-28 20:41:01 +01:00
Bob
3376792c41 bullet factories, itemgunbase 2023-01-26 22:50:45 +01:00
Bob
4d9209a407 more work on updating gun cfgs 2023-01-25 21:31:24 +01:00
Bob
d87000ba22 more recipe stuff, gun cfgs, bullet cfg class 2023-01-24 22:38:34 +01:00
Grumpyaaa
77a029f8b4
ForgeGradle fixes 2023-01-24 17:29:06 +02:00
Grumpyaaa
1ecd569a28
Updated Gradle version 2023-01-24 17:25:39 +02:00
Boblet
024f182f98 removed a couple MBs of unused garbage 2023-01-24 08:15:00 +01:00
Bob
547cafd393 ammo subtypes, enum definitions, recipe updates 2023-01-23 20:37:03 +01:00
Voxelstice
830f742ac0
why did i not do this earlier 2023-01-16 18:29:23 +03:00
Voxelstice
1c0006ba39
i think a variable is not necessary for this 2023-01-16 18:01:23 +03:00
Voxelstice
ed43221197 some more opencomputers stuff 2023-01-16 17:58:45 +03:00
Boblet
7ae0499e04 haz sys hotfix 2023-01-16 08:17:26 +01:00
HbmMods
2b1977cec4
Merge pull request #883 from Doctor17-git/master
Updated ru_RU.lang
2023-01-15 20:42:50 +01:00
Doctor17-git
a1d982779e
Updated ru_RU.lang
aaaa
2023-01-15 22:42:21 +03:00
Bob
7f64b418fd the new, the old, the mold 2023-01-15 20:23:09 +01:00
Boblet
c9cef35acf crash fix, acidizer GUI change 2023-01-13 14:53:32 +01:00
HbmMods
066c6af53d
Merge pull request #874 from Doctor17-git/master
Updated ru_RU.lang
2023-01-11 13:39:46 +01:00
Doctor17-git
8653e5db0c
Updated ru_RU.lang
updated russian localization
2023-01-11 15:19:56 +03:00
Boblet
20535ed839 even more fixes 2023-01-11 12:46:38 +01:00
Boblet
fda5389ac2 fixes, again 2023-01-10 16:40:44 +01:00
HbmMods
92eae300ae
Merge pull request #871 from Doctor17-git/master
Updated ru_RU.lang
2023-01-09 22:55:51 +01:00
Doctor17-git
85bfb93f5e
Updated ru_RU.lang
h
2023-01-10 00:54:44 +03:00
Bob
ddb0e7c4a1 augh 2023-01-09 21:54:13 +01:00
Bob
5137f1b86d more bedrock ores 2023-01-09 20:47:32 +01:00
Boblet
c69e85c9e9 some fixes 2023-01-09 14:44:20 +01:00
HbmMods
f210605feb
Merge pull request #868 from Doctor17-git/master
Updated ru_RU.lang
2023-01-08 22:24:27 +01:00
Doctor17-git
08a3c70de7
Updated ru_RU.lang
updated russian localization
2023-01-09 00:17:15 +03:00
Bob
46a45a7f24 bedrock ore processing speedrun (any%) 2023-01-08 21:36:15 +01:00
Bob
4c85ee6616 256k tank fixes, DFC funnies, bedrock ore work 2023-01-06 23:15:01 +01:00
HbmMods
5baaf48293
Merge pull request #865 from Ginsway/master
Update Translation
2023-01-04 18:39:35 +01:00
Bob
45c01c0213 marvin's marvelous mechanical mixer 2023-01-04 18:36:17 +01:00
Ginsway
cbe114752b add tile.door 2023-01-04 10:06:37 +08:00
Ginsway
3294dbdd3e Update zh_CN.lang 2023-01-04 09:50:17 +08:00
Vaern
168ba3b1d9 Removed aluminum cap, iron, gold, and aluminum shredder blades
at bob's request
2022-12-27 11:20:50 -08:00
Vaern
b26cbc4b6d Removed schrab & cmb stamps / blades, moved desh tier to actually desh 2022-12-27 10:50:28 -08:00
Bob
15677ccd6e veinminer capability for excavator, annihilated siege coins 2022-12-27 17:56:37 +01:00
HbmMods
cbb7013d29
Merge pull request #856 from Vaern/master
Removed fibrosis, pirfenidone, gloves; reverted reacher functionality
2022-12-26 15:12:18 +01:00
Bob
55443398e4 the ferocious miner 2022-12-26 15:10:24 +01:00
Vaern
23beeae875 Fixed format errors 2022-12-23 23:01:37 -08:00
Vaern
8b08b28264 Fixed slight bug 2022-12-23 22:55:21 -08:00
Vaern
dfb237d9cd Removed fibrosis, pirfenidone, gloves; reverted reacher functionality 2022-12-23 22:44:51 -08:00
Bob
d886024f39 finished fixing teleporter jank 2022-12-20 21:21:42 +01:00
Boblet
6733698a6b fixed boxduct color, leftover teleporter GUI, telepad mapping 2022-12-20 16:12:47 +01:00
Boblet
08076885cf interdimensional teleporters yeah 2022-12-20 10:41:37 +01:00
Boblet
d2f36ed784 uncrapped teleporters 2022-12-20 09:42:13 +01:00
Bob
3fe042180b shut up 2022-12-18 22:27:40 +01:00
Bob
1ff0379d97 prettified repairing 2022-12-18 22:25:00 +01:00
Bob
05b5d17a1e blowtorches, repairable tanks, more drill work 2022-12-18 21:39:27 +01:00
Bob
e609272ec5 drill air block fix, proper cooling tower particle condition 2022-12-18 01:52:04 +01:00
Boblet
e5fbdf0a38 more mining drill stuff 2022-12-16 15:12:24 +01:00
Bob
5d56ef0f00 small explosion fix 2022-12-15 21:24:31 +01:00
Boblet
d6e91eca9c improved 256k tank explodability, fixed scaffolds 2022-12-15 16:27:47 +01:00
Boblet
9bcb388d92 colored scaffolds, spring cleaning 2022-12-15 11:25:08 +01:00
Bob
6e3114f83e fixed fluid tank conversion, some new mining drill stuff 2022-12-14 21:41:18 +01:00
Bob
ee567ae27a bang 2022-12-14 18:49:41 +01:00
Boblet
f5b8ea4338 paintable cables, 256k tank on new multiblock system 2022-12-14 11:58:40 +01:00
Bob
8aaa0d0c5d exploding 256k tanks 2022-12-13 21:57:05 +01:00
Bob
2ff7052ca3 return of the radio 2022-12-12 22:39:07 +01:00
Boblet
beee798c70 hadron coil number formatting, radio controllable interface, recipe fix 2022-12-12 16:05:29 +01:00
HbmMods
6483a58857
Merge pull request #843 from Doctor17-git/master
Updated ru_RU.lang
2022-12-11 17:25:38 +01:00
Bob
577d1f5fa6 bleh 2022-12-11 17:25:22 +01:00
Doctor17-git
2440e6e4cc
Updated ru_RU.lang
updated russian localization
2022-12-11 19:21:19 +03:00
Bob
55b5ed578c fixes, briquettes, fluid gauges and paintable ducts, recipe changes 2022-12-11 16:47:34 +01:00
Bob
8ab33835d2 combination recipe adjustments, added back older coke recipes, fixes 2022-12-10 16:25:32 +01:00
Bob
a218206f80 pesky railcraft compat, more recipes, hydroseeding 2022-12-09 23:37:44 +01:00
Boblet
1dea7f7ba3 wood oil & coal tar creosote 2022-12-09 13:08:10 +01:00
Bob
0b6d457525 combination oven 2022-12-08 22:56:20 +01:00
Boblet
7a92f88338 meltdownier meltdowns 2022-12-07 11:30:25 +01:00
Bob
fd1cce407c moldy fixes 2022-12-06 21:58:24 +01:00
Boblet
f8f31f28d4 more intuitive foundry tank outlet functionality, higher oil yields 2022-12-06 16:56:35 +01:00
Bob
7c4031320f just throw a continental breakfast at my face 2022-12-04 21:12:32 +01:00
Bob
94a0f4fb25 yowser 2022-12-04 20:18:06 +01:00
HbmMods
cfb204e478
Merge pull request #828 from Doctor17-git/master
Updated ru_RU.lang
2022-12-04 19:42:35 +01:00
Doctor17-git
2934d198e7
Updated ru_RU.lang
updated russian localization
2022-12-04 20:59:36 +03:00
Bob
cd12b9c86e finished engine, fluid fixes, more .44 models, configs 2022-12-04 18:54:29 +01:00
Bob
c38323ff5e finished heat exchanger, fixed remaining fluid API mistakes, mug 2022-12-03 18:01:57 +01:00
Boblet
49ac34ddba more heatex work 2022-12-02 14:49:58 +01:00
Boblet
e037e06841 i don't even know how this one happened 2022-12-02 09:01:37 +01:00
Boblet
eedf2b61c4 fixed hazard system memery, some fluid connections that didn't render 2022-12-02 08:25:16 +01:00
Bob
9f3424120e fancier steel furnaces, fixed new fluid sys for some machines, strata 2022-12-01 22:07:11 +01:00
Boblet
dc6a5e6ebb GT6 iron type compat for crucible, hazard values for naquadah 2022-12-01 10:44:45 +01:00
Bob
a5bc0cd4dc minor tweaks 2022-11-30 20:47:38 +01:00
Boblet
cafd78cb73 creeper defuser, heatex GUI 2022-11-30 16:08:36 +01:00
Bob
7b370075d7 small fixes, ivy mike and heat exchanger models 2022-11-29 21:34:50 +01:00
Boblet
84587c25ef oil well configs 2022-11-29 16:46:38 +01:00
Boblet
e882084d71 gas tester, levi fix, trixite recipe change 2022-11-29 13:09:13 +01:00
Boblet
378ad51018 rebalanced biofuels and biomass, heat exchanger as a TU source 2022-11-28 16:58:27 +01:00
HbmMods
6791cf5095
Merge pull request #823 from Doctor17-git/master
Updated ru_RU.lang
2022-11-27 20:47:25 +01:00
Doctor17-git
4bb0fbbc35
Updated ru_RU.lang
updated russian localization
2022-11-27 20:37:02 +03:00
Bob
86a2a2fcc1 electric press IO, boxduct and chemplant fixes, mask man despawn trigger 2022-11-27 17:35:56 +01:00
Bob
ce34f9ca77 some more fluid stuff, funny torches 2022-11-26 23:47:47 +01:00
HbmMods
f3446a05ea
Merge pull request #821 from Doctor17-git/master
Updated ru_RU.lang
2022-11-25 15:00:12 +01:00
Doctor17-git
b08ffaf883
Updated ru_RU.lang
updated russian localization
2022-11-25 16:57:40 +03:00
Boblet
1ab40869b0 GUI stuff, fluid API for plasma heater, boxduct inv rendering 2022-11-25 14:28:29 +01:00
Boblet
f02232b079 gutted all explosion types except mk3 and mk5, recipe improvements, dust 2022-11-25 09:48:23 +01:00
Bob
6c317ceb44 bounding box fixes 2022-11-24 22:19:46 +01:00
Boblet
babe66c154 boxduct hitbox, tile mappings 2022-11-24 16:52:43 +01:00
Bob
dc6e8e6561 whatever 2022-11-23 20:35:32 +01:00
Boblet
1d4d0166d6 more configs, fluid barrel hopper IO yeah 2022-11-23 16:25:24 +01:00
Bob
3e89c021b8 small fixes, proper fluid duct collisions 2022-11-22 22:37:22 +01:00
Boblet
30038b7f06 chemfac new fluid API, boxduct rendering fix, some RTTY funnies 2022-11-22 15:32:37 +01:00
Bob
bb404bc703 more boxduct variants, fixed soysauce launcher wackyness 2022-11-21 21:14:13 +01:00
Boblet
ed219824f9 proper fluid IO for soyuz launcher, item transfer BS 2022-11-21 16:26:46 +01:00
Bob
afaedaca95 mk5, some fluid stuff 2022-11-20 20:38:46 +01:00
Bob
bb2a2b9607 new novac model, crucible fixes 2022-11-19 13:38:10 +01:00
Boblet
aa589d30d7 spring cleaning, fixed snowglobe lighting, RBMK cooler new fluid API 2022-11-18 14:31:42 +01:00
Bob
56cdc3ffe7 torex: the comeback 2022-11-17 22:09:26 +01:00
Boblet
f7bdf1d632 a ton of new fluid API users 2022-11-17 16:59:15 +01:00
Boblet
3b858df7ba a tiny bit of fluid stuff 2022-11-15 16:00:33 +01:00
HbmMods
7884d1372a
Merge pull request #811 from Doctor17-git/master
Updated ru_RU.lang
2022-11-14 16:33:41 +01:00
Boblet
55f20f7780 bit by bit we inch towards better fluid transfer 2022-11-14 16:33:19 +01:00
Doctor17-git
af2d9dc59b
Updated ru_RU.lang
updated russian localization
2022-11-14 17:44:11 +03:00
Bob
b4d8cd01c8 not my problem 2022-11-13 21:51:17 +01:00
Bob
b0d1c346b8 more sensible carbon distribution, finished steam engine 2022-11-13 21:11:54 +01:00
Bob
b04054dd9f multi artillery fix, functional steam engine 2022-11-13 00:10:39 +01:00
Bob
3d2ccd537b my bals 2022-11-12 12:09:22 +01:00
Bob
e373857c3a fixed some server crasheroos 2022-11-12 11:32:44 +01:00
Bob
adf88b70e3 fixed broken packet, new tom crater 2022-11-11 21:15:35 +01:00
Boblet
3a784919fa improved some missile recipes, cleaned up tom impact handling 2022-11-11 15:20:57 +01:00
Boblet
d494df6ead slightly less broken blast furnace IO 2022-11-10 16:44:39 +01:00
Bob
9caaa89405 well that was fucking stupid 2022-11-09 23:13:48 +01:00
Boblet
f1a6e4526b igen configs, HSS crucible recipe tweak 2022-11-09 15:54:48 +01:00
Bob
52cfe40da8 battery schmattery 2022-11-08 21:38:30 +01:00
Boblet
06b66e3edf all hail the spreadsheet 2022-11-08 16:56:39 +01:00
HbmMods
a8d5c94baf
Merge pull request #795 from Vaern/structures-pr
New Structure, ProceduralComponents Base class, Filing cabinets, ItemBookLore
2022-11-07 21:22:42 +01:00
HbmMods
f56877aaa9
Merge pull request #797 from Doctor17-git/master
Updated ru_RU.lang
2022-11-07 15:54:07 +01:00
Doctor17-git
ef1f2cf6e8
Updated ru_RU.lang
updated russian localization
2022-11-07 17:49:53 +03:00
Boblet
1ef1d2ab55 oh no! anyway 2022-11-07 08:19:10 +01:00
Boblet
ab0143347f pain² 2022-11-07 08:18:21 +01:00
Vaern
3e0af26a30 ach 2022-11-06 12:51:50 -08:00
Vaern
cd70fc7c10 BlockDecoModel moved to BlockEnumMulti, more lore, vinyl tile crafting 2022-11-06 12:45:15 -08:00
Bob
ccd460fe9e more jar worlds, fixed centrifuge NEI handler, custom block highlighting 2022-11-06 18:50:22 +01:00
Vaern
ea6f1ffff0 pr preparation 2022-11-05 22:05:55 -08:00
Bob
8aa63082b9 new centrifuge GUI, heating oven 2022-11-05 22:41:38 +01:00
Bob
01aad6bc56 augh 2022-11-05 12:08:15 +01:00
Boblet
4985b2e550 invertable foundry filters, more machine configs 2022-11-04 15:08:17 +01:00
Bob
385a7cef83 steam engine model, some more config crap 2022-11-03 23:16:40 +01:00
Boblet
2f0c9de15b i want to die: cover yourself in oil edition 2022-11-03 16:21:49 +01:00
Boblet
36cef5e2fe fair battery output, prototype for balanced solidification recipes 2022-11-02 16:38:48 +01:00
HbmMods
04cd4e8951
Merge pull request #790 from Doctor17-git/master
Updated ru_RU.lang
2022-10-31 15:54:38 +01:00
Doctor17-git
9e72db37b3
Updated ru_RU.lang
updated russian localization
2022-10-31 17:52:29 +03:00
Boblet
a724ee53c8 some untested garbage 2022-10-31 15:49:20 +01:00
Vaern
42efc46a9f More bedrooms & loot, removed militarybasefeatures, compartmentalization 2022-10-30 20:39:04 -07:00
Vaern
f59f5c7a83 Merge remote-tracking branch 'HbmMods/master' into structures 2022-10-30 14:32:12 -07:00
Vaern
e1c26f338a Fixed components, added block selector for slabs 2022-10-30 14:31:18 -07:00
Bob
2ca8d32341 liquefied pain 2022-10-30 21:34:55 +01:00
Bob
b38ad7691d fixes, satellite memes, yummy ore gen 2022-10-30 20:10:48 +01:00
Vaern
e8ef0c1a87 Steel Filing Cabinet 2022-10-29 19:54:56 -07:00
Vaern
3dbb3c6fa6 RTG test room, fillSpace for structureComponents 2022-10-29 15:01:00 -07:00
Vaern
18fbd19a01 Reactor room, randomized block selector for stairs 2022-10-29 15:00:42 -07:00
Vaern
07373dde56 Reeds in swampification 2022-10-29 12:18:35 -07:00
Vaern
c56257945b mmmmm conversation pit 2022-10-29 12:18:35 -07:00
Vaern
efdbff6cc2 CenterCrossing, fixes to major issues with procedural gen, method refs.
will probably add more variations to the center crossing
2022-10-29 12:18:35 -07:00
Vaern
009e8cd31a aaaaaaaaaaaaaaaaaaaaaaaaa 2022-10-29 12:18:35 -07:00
Vaern
3526af3bdb changes to the gui; save-dependent info and i18n 2022-10-29 12:18:35 -07:00
Vaern
a0332d4241 mh 2022-10-29 12:18:35 -07:00
Vaern
77c1b53e31 Loose Paper appearance type, fixes, new page textures 2022-10-29 12:18:35 -07:00
Vaern
117d0116d2 ItemBookLore, GUIBookLore, instant pain
story of my life
https://cdn.discordapp.com/attachments/759183012494966795/1024516652278231110/trim.1B823851-DAB1-4A47-B5CE-BFB3B7062D4E_1.mov
2022-10-29 12:18:35 -07:00
Vaern
7e8611bebc Vinyl Tiles, Refactoring to allow for proper subclasses 2022-10-29 12:18:35 -07:00
Vaern
decce7723c hm
SupplyRoom, fixed limited rooms not spawning


WasteDisposal


bedroom
2022-10-29 12:18:35 -07:00
Vaern
86e23dc89d fixes, cobwebs, swampification, connector cables 2022-10-29 12:18:35 -07:00
Vaern
ac69b9fb9d UtilityCloset, WideIntersection, fixes 2022-10-29 12:18:35 -07:00
Vaern
7edbf615b6 Major refactoring, some fixes
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
2022-10-29 12:18:35 -07:00
Vaern
697752c839 Procedural Generation fixes + added Intersection 2022-10-29 12:18:35 -07:00
Vaern
d804c81e18 it actually works now 2022-10-29 12:18:35 -07:00
Vaern
27e4c1f746 Corridors and Block Placement Optimization
Added regular and wide corridors + optimized block placement methods in Feature class
2022-10-29 12:18:35 -07:00
Vaern
1d37f1f785 BunkerComponents
stuff
2022-10-29 12:18:35 -07:00
Vaern
d36626b813 MapGenBunker 2022-10-29 12:18:35 -07:00
Vaern
653ea24d86 okay this was pretty painful ngl
need a better way for doing lots of item generation
mh


has placed loot boolean replacement
2022-10-29 12:18:35 -07:00
Vaern
0f18a54073 Sounds & Logic for the filing cabinet 2022-10-29 12:18:35 -07:00
Vaern
8654cfd92d BlockDecoContainer, filing cabinet 2022-10-29 12:18:35 -07:00
Vaern
72c0c2f2ac LargeOfficeCorner, two more structure wands
i would like to reiterate: bob i could kiss you
2022-10-29 12:18:35 -07:00
Bob
834f0d294b foundry fixes and improvements 2022-10-29 18:23:48 +02:00
Boblet
08c9f4285c some finishing touches, crucible smelting conversion 2022-10-28 14:51:11 +02:00
Bob
9eb47c3219 better smelting with flux 2022-10-27 23:17:11 +02:00
HbmMods
b73a7d52ce
Merge pull request #775 from sdddddf80/master
Updated zh_CN.lang
2022-10-27 20:51:09 +02:00
Boblet
5867640c22 god have mercy 2022-10-27 16:47:54 +02:00
Bob
f3e0ad9cc2 fixed blast furnace IO, reeds properly break, funny stone 2022-10-26 23:01:18 +02:00
Bob
3f7a446e79 yeah whatever 2022-10-26 00:40:36 +02:00
Boblet
084f5abd19 funny water plant, configurable blast furnace IO sides, shredder IO fix 2022-10-25 16:10:02 +02:00
Boblet
9748a34ed0 cleanup, priority settings for diodes 2022-10-24 16:59:39 +02:00
Bob
10bc50d9a7 simplified some recipes 2022-10-23 20:04:00 +02:00
Bob
56d719d049 chunkier fatman, silicon compat 2022-10-22 23:55:54 +02:00
Boblet
bd4976f6f6 better boiler explosion, blast furnace test 2022-10-21 15:08:53 +02:00
Boblet
67ee28ddbe crucible smelting and alloying JSON configs 2022-10-20 13:53:44 +02:00
Bob
8134907dd9 metadata aware connected textures 2022-10-19 21:06:05 +02:00
Bob
6fa857fed0 improved Mk3 handling 2022-10-19 20:09:12 +02:00
Boblet
ed6ce927a2 forgot some files 2022-10-19 16:58:06 +02:00
Boblet
f235f1445f some minor volcano tweaks 2022-10-19 14:59:38 +02:00
Bob
7a9255ed2d fixed some lang keys, better material name support 2022-10-18 18:59:19 +02:00
Boblet
0069a3c0af gregtech 6 prefix compat for NTM crucible, lang entries for materials 2022-10-18 15:31:16 +02:00
HbmMods
60e120cadb
Merge pull request #774 from Doctor17-git/master
Updated ru_RU.lang
2022-10-18 08:08:08 +02:00
sdddddf80
d69ac11c11
Merge branch 'HbmMods:master' into master 2022-10-18 10:51:37 +08:00
sdddddf80
3b6c83a656
updated zh_CN.lang
updated zh_CN.lang
2022-10-18 10:50:41 +08:00
Doctor17-git
8fcfd16109
Updated ru_RU.lang
updated russian localization
2022-10-17 17:36:21 +03:00
Bob
5f33fa8ee6 i suffer 2022-10-16 18:37:21 +02:00
Bob
fff48c5ca1 and there we go 2022-10-16 18:13:56 +02:00
Bob
6363cf4b1a actually working rocket artillery 2022-10-15 20:00:25 +02:00
Bob
0c5b2bcf57 some HIMARS rendering stuff, cargo shell impact fix 2022-10-13 22:55:19 +02:00
Boblet
00b6ef249e artillery rocket behavior 2022-10-13 16:26:24 +02:00
Bob
52a8c0df77 prettier centrifuge ay 2022-10-12 23:51:18 +02:00
Boblet
37ff82ee16 small fluid tweaks, HIMARS rocket item class, cargo arty shell 2022-10-12 16:44:52 +02:00
Bob
8130b62821 spring cleaning, added missing stairs 2022-10-11 22:45:34 +02:00
Bob
211da211b4 finished electric heater 2022-10-10 23:50:37 +02:00
Boblet
23fc31e2b0 electric heater functionality 2022-10-10 16:38:49 +02:00
Bob
3d765347dc redid all the turbines with the new fluid traits, electric heater 2022-10-09 21:00:50 +02:00
Bob
2ea17f1e13 boil yourself 2022-10-09 01:26:18 +02:00
Boblet
b15a69aa50 concrete stairs and a crapton of slabs 2022-10-07 13:53:29 +02:00
Boblet
870bec5d7d more crucible materials, better template search, crucible template icons 2022-10-06 16:50:23 +02:00
Boblet
8ca1513bf8 the thicc NEI handler that does nothing except render things thicc 2022-10-06 13:08:27 +02:00
Boblet
ab083eec59 heatable fluid trait, steam compression headaches 2022-10-05 16:29:25 +02:00
HbmMods
3ef8533142
Merge pull request #761 from Doctor17-git/master
Updated ru_RU.lang
2022-10-04 19:35:31 +02:00
HbmMods
a94cd9b7fd
Merge pull request #760 from Voxelstice/more-oc-stuff
More opencomputer stuff
2022-10-04 19:33:55 +02:00
Doctor17-git
af1799db38
Updated ru_RU.lang
updated russian localization
thanks to Sob for help
2022-10-04 18:55:44 +03:00
Voxelstice
f19e42cf93 h 2022-10-04 18:35:05 +03:00
Bob
f833fd512d the commit i missed + safer DFCs 2022-10-03 19:09:35 +02:00
Boblet
dd7695e00b some NEI handler stuff 2022-10-03 16:21:24 +02:00
HbmMods
91d4160d66
Merge pull request #756 from Doctor17-git/master
Updated ru_RU.lang
2022-10-02 20:30:31 +02:00
Doctor17-git
3929e6d013
Updated ru_RU.lang 2022-10-02 21:13:58 +03:00
Bob
b7456f1c51 NEI handlers, fixes, more matdefs, foundry pieces always dropping mats 2022-10-02 20:01:36 +02:00
HbmMods
3d1a195da5
Merge pull request #753 from Vaern/quickPR
Fixed Infinite loop, added safety for foundation placement
2022-10-01 23:46:31 +02:00
Bob
99f3909bed crucible templates in folder, storage tanks, recipes 2022-10-01 23:45:58 +02:00
Vaern
99bd1a3723 Fixed Infinite loop, added safety for foundation placement 2022-10-01 08:14:18 -07:00
Bob
6bb58fdcd1 Merge remote-tracking branch 'origin/master' 2022-09-30 16:04:50 +02:00
Boblet
db5757a283 i forgot to push again - intermission 2022-09-30 14:34:04 +02:00
Bob
19e5cf36c4 removable scraps, better textures, outlet redstone control 2022-09-29 23:21:30 +02:00
Boblet
46f11acb9b fixed diode lag, proper limit, functional crucible recipes, scraps 2022-09-29 16:52:05 +02:00
Bob
1f2937c666 mold recipes, casting basin automation 2022-09-28 22:31:58 +02:00
Boblet
4ee7e680fb Too Many Molds
there is toxic black mold growing in my brain
2022-09-28 16:54:42 +02:00
Bob
35c9833e69 fixed pouring, rendering for foundry outlet 2022-09-27 23:22:27 +02:00
Doctor17-git
ea18a9b4c9
Updated ru_RU.lang 2022-09-27 19:36:03 +03:00
Boblet
462be270d9 improved pouring code, crucible util class 2022-09-27 16:51:58 +02:00
Bob
50826c13f6 fixed pouring, proper item rendering in molds 2022-09-26 23:27:57 +02:00
Boblet
52fc3868ff more base code, usable molds 2022-09-26 16:54:24 +02:00
Boblet
05d370e7d1 better base code organization for foundry blocks, standardized pouring 2022-09-26 14:06:31 +02:00
Bob
05e07eae51 molds and channels and basins 2022-09-25 21:31:33 +02:00
Bob
428cd342bd the mcdonalds among us meal 2022-09-25 00:26:45 +02:00
Boblet
90299bd1ba foundry basin, updated crucible block API 2022-09-22 16:54:37 +02:00
Bob
4479b8bcb9 glowier molten materials, mat colors 2022-09-21 23:08:08 +02:00
Boblet
377108166d foundry utility block base code, more crucible stuff 2022-09-21 16:43:34 +02:00
Boblet
60b6ec494c crucible GUI work, material IDs 2022-09-20 17:00:05 +02:00
Bob
8910c6c662 crucible fun 2022-09-18 21:04:28 +02:00
Boblet
ba21416f69 small test with finite fluids 2022-09-16 15:14:47 +02:00
HbmMods
3a94a2978a
Merge pull request #747 from Vaern/readme
Update README.md
2022-09-16 11:31:18 +02:00
Vaern
a311e87ccd
Update README.md 2022-09-16 00:15:24 -07:00
Bob
afb6ba1476 better BlockDummyable collisions, some more sawmill stuff 2022-09-15 22:28:51 +02:00
Boblet
77c0ae1834 some minor crystal funnies and rocket artillery code 2022-09-15 16:22:02 +02:00
Boblet
896b91d960 structure analysis wands 2022-09-15 14:09:47 +02:00
Boblet
48fc913ac2 more material stuff, artillery turret basecode for greg & HIM 2022-09-14 17:00:10 +02:00
Bob
b0647c3950 more material shenanigans 2022-09-13 22:40:39 +02:00
Boblet
c0cb5b3ebc material def using DictFrames 2022-09-13 16:59:48 +02:00
Bob
5a87f9be64 crucible GUI, smeltable material definitions 2022-09-12 23:21:39 +02:00
Boblet
f608d55f93 small material test 2022-09-12 16:59:29 +02:00
HbmMods
9f30c1c021
Merge pull request #745 from Vaern/master
BlockDecoModel, Structure stuff
2022-09-12 08:14:41 +02:00
Vaern
df7277cf83 screw it 2022-09-11 14:23:05 -07:00
Vaern
34d3b11713 bozo get btfo'd kekW 2022-09-11 14:23:05 -07:00
Vaern
0826e7ca50 fixed placedoor, shifted structure spawns and stuff 2022-09-11 14:23:05 -07:00
Dr. Maniac, PHD
f37ac60423 stair meta working 2022-09-11 14:23:05 -07:00
Vaern
c0e116f56a how do you fuck this up that badly
thanks mojang
2022-09-11 14:23:05 -07:00
Vaern
ea1a79f559 h 2022-09-11 14:23:05 -07:00
Vaern
a5a3a96bdc hm 2022-09-11 14:23:05 -07:00
Vaern
bf385c831d big office building 2022-09-11 14:23:05 -07:00
Vaern
4e111e968a meh 2022-09-11 14:23:05 -07:00
Vaern
5060276173 BlockDecoModel class, or more importantly, DECO COMPUTERS!
remind me to figure out how smooth-shading works for ISBRHs tomorrow as it is half past midnight
2022-09-11 14:23:05 -07:00
Vaern
5f4c6469c4 Organized structure classes, added config for structures and loot within
tomorrow we got the epic looking computer deco block coming in it's freaking amazing gamers see you on the battlebus
2022-09-11 14:23:05 -07:00
Vaern
7d156d9ff9 argh
this shit needs to be sorted out
2022-09-11 14:22:32 -07:00
Bob
8353e313d6 fixes, lung irritant notifications, small crucible 2022-09-11 22:58:51 +02:00
Boblet
7a500e3fb5 tintable WIAJ arrow, EntityThrowableInterp 2022-09-09 14:55:05 +02:00
Bob
0eb2679264 more sawdust more sawdust 2022-09-07 22:03:24 +02:00
Boblet
732827f1d0 yummy sawdust 2022-09-07 16:48:08 +02:00
Bob
1f58ab69a7 yeah whatever this is 2022-09-06 22:22:12 +02:00
HbmMods
b72355fc06
Merge pull request #732 from Doctor17-git/master
Updated ru_RU.lang
2022-09-04 22:10:13 +02:00
Doctor17-git
8e77e79579
Updated ru_RU.lang 2022-09-04 23:05:36 +03:00
Bob
492440d86c dead plants, usable presentation system 2022-09-04 20:23:31 +02:00
Bob
00b089188b funny herb paste 2022-09-01 21:58:58 +02:00
Boblet
5b408de422 some plant related recipes 2022-09-01 16:59:32 +02:00
Bob
f45fb21d63 firebox in a jar 2022-08-31 22:58:03 +02:00
Boblet
003177cba4 he's dead 🎉 🎉 🎉 2022-08-31 16:35:07 +02:00
Bob
8f837aa783 SILEX in a jar 2022-08-29 23:41:50 +02:00
Boblet
1c79e4b900 some compat crap 2022-08-29 16:32:55 +02:00
Boblet
fea8dd9628 hakita redemption arc 2022-08-29 10:28:00 +02:00
Bob
59bc45df9a recipe reload command, FEnSU and GC jar presentations 2022-08-28 20:48:56 +02:00
Bob
393f2e4280 a film in a jar 2022-08-27 22:53:27 +02:00
Boblet
448e1c947c jar tooltip test texture, scene offset actions 2022-08-26 15:13:02 +02:00
Bob
e0e50226d8 basic GUI panel for jar world 2022-08-25 23:16:07 +02:00
Boblet
916cab1fbd jar foreground actors 2022-08-25 16:58:27 +02:00
Bob
091d6f3d2c stirling in a jar 2022-08-24 22:08:18 +02:00
Boblet
df0693db12 tile entity? put it in the jar 2022-08-24 16:48:55 +02:00
Boblet
f57a6f35a4 cyclotron recipe fix, hashCode implementation for ODStacks 2022-08-24 10:41:42 +02:00
Bob
a5f4726244 the magic of doing not a whole lot 2022-08-23 22:37:47 +02:00
Boblet
53bcebfe97 jar test sequence, more animation types 2022-08-23 16:08:31 +02:00
Bob
1a1be50d3d cram it in a jar 2022-08-22 22:02:18 +02:00
Boblet
9c57c73d11 small test involving jars 2022-08-22 16:09:48 +02:00
Boblet
8e1b32cb42 fixes, fluid trait improvements 2022-08-22 12:18:36 +02:00
HbmMods
b50a2a6e4b
Merge pull request #718 from Doctor17-git/master
Updated ru_RU.lang
2022-08-22 07:56:14 +02:00
Doctor17-git
408461a29b
Updated ru_RU.lang 2022-08-21 20:30:06 +03:00
Bob
6196edc1b6 i don't even know how this one happened 2022-08-21 18:42:37 +02:00
Bob
b79059b32e nobody saw that 2022-08-21 18:20:22 +02:00
Bob
ee11de50fa the ferociouss chemical spewer 2022-08-21 17:55:38 +02:00
Boblet
82a26a929d a command for diagnostic and suicide 2022-08-19 15:21:58 +02:00
Boblet
739ac79a6a tooltips for persistent containers 2022-08-19 11:23:22 +02:00
Bob
42c154fa6e this glorified garden hose 2022-08-18 23:03:59 +02:00
Bob
9bdd738fdc it's to prevent you from healing
how come every time i port some absolute garbage feature that people keep telling me is "good" and "justified" those very people start to scream, it's almost like it wasn't good to begin with
2022-08-18 20:33:27 +02:00
Boblet
a35236ce14 made use of IFillableItem, persistent fluid tanks 2022-08-18 16:16:14 +02:00
HbmMods
c7ded454bc
Merge pull request #696 from Toshayo/master
Config comments, satellite registry changes
2022-08-18 11:03:06 +02:00
Boblet
8c4495741c new fillable item system, armor slots for mod table 2022-08-18 11:02:54 +02:00
Boblet
14450d36de gutted tool abilities, small fixes 2022-08-17 16:20:27 +02:00
Boblet
776a203f8a centrifuge and cyclotron recipe configs
also some torex tweaks
2022-08-16 16:40:17 +02:00
Boblet
ea16e518dc rewrote the entire fluid trait system
ow
2022-08-16 11:28:34 +02:00
HbmMods
5fc6db11fc
Merge pull request #713 from Doctor17-git/master
Updated ru_RU.lang
2022-08-15 16:58:19 +02:00
Doctor17-git
5977c27b7a
Updated ru_RU.lang 2022-08-15 17:57:36 +03:00
Doctor17-git
8bbbe7340f
Updated ru_RU.lang 2022-08-15 17:52:08 +03:00
Bob
a9ea9a4b1f the ferocious sorter 2022-08-15 15:57:18 +02:00
Boblet
a9d7f9ca20 merged blast furnace recipe handling, BF explosion crash fix, textures 2022-08-12 11:50:02 +02:00
Bob
9ca2845bef even faster-er boxer, unboxer IO and upgrade fix, model specification 2022-08-11 23:45:17 +02:00
Boblet
4605a24c32 more boxes and GUI textures 2022-08-11 16:46:01 +02:00
Boblet
1e1dac2f11 the unboxing apparatus, conveyor chute fix 2022-08-10 16:50:04 +02:00
Bob
77de64c7b6 more boxes per box 2022-08-09 22:18:48 +02:00
Boblet
521b040f63 amazon warehouse employee machine 2022-08-09 16:46:21 +02:00
Bob
9ae1801e76 ow 2022-08-08 21:17:39 +02:00
Bob
b1e6936e08 fixes, RBMK console screen functionality, schmalz 2022-08-04 18:58:13 +02:00
Doctor17-git
98d48dd0dc
Updated ru_RU.lang 2022-08-01 00:27:16 +03:00
HbmMods
5f0a484f33
Merge pull request #700 from Doctor17-git/master
Updated ru_RU.lang
2022-07-31 23:26:44 +02:00
Doctor17-git
064868d7b5
Updated ru_RU.lang 2022-08-01 00:24:55 +03:00
Bob
874061999d killed unused trash, added deadly gear of destruction 2022-07-31 23:13:24 +02:00
Toshayo
ba2565733d Add comments to config entries (instead of having those in pinned discord messages ¯\_(ツ)_/¯) 2022-07-28 09:40:47 +02:00
Toshayo
4f6edf12a5 Change access modifier to satellite registration to allow custom satellites. 2022-07-27 21:27:29 +02:00
HbmMods
a4eeb0703f
Merge pull request #679 from Silly541/master
LBSM toggle for ME drive/portable cell radiation
2022-07-26 09:55:44 +02:00
HbmMods
445422f5d0
Merge pull request #695 from Toshayo/master
master
2022-07-26 09:55:17 +02:00
Bob
ccc575c173 removed trash, improved turbofan, boxy pipes and more 2022-07-25 20:29:01 +02:00
Toshayo
018704f206 Move satellite loot table to registry system to make possible the creation of custom mining satellites via addons :) 2022-07-24 18:27:54 +02:00
HbmMods
7c75ae997a
Merge pull request #676 from Vaern/master
Sellafield Changes
2022-07-23 00:00:56 +02:00
Bob
ae6763ae7e fixes, iGen IO, nicer fluid tank model 2022-07-22 23:58:42 +02:00
Bob
0c0ca15dbf iron furnace, but it's made from steel and works completely different 2022-07-20 22:41:48 +02:00
Bob
461101dd72 fireball...box, firebox 2022-07-17 23:02:55 +02:00
Bob
6c74dd71b4 better highlighting on stack tooltips, some funky 2022-07-14 22:38:30 +02:00
Boblet
11a83911a3 turret ammo tooltips 2022-07-14 16:59:17 +02:00
Boblet
0bb05783ce Auto stash before merge of "master" and "origin/master" 2022-07-14 13:57:05 +02:00
Silly541
64c9d19942 Added LBSM toggle for ME radiation 2022-07-13 23:38:53 -07:00
Vaern
dfb15b2510 Sellafield Changes 2022-07-11 12:07:33 -07:00
HbmMods
39c3596cc1
Merge pull request #673 from Doctor17-git/master
Updated ru_RU.lang
2022-07-10 22:10:39 +02:00
Doctor17-git
4f5fe6e9f2
Updated ru_RU.lang 2022-07-10 23:09:20 +03:00
Bob
d566e235b3 shit bricks 2022-07-10 22:05:31 +02:00
Bob
c6e472ddd9 cæp 2022-07-10 21:02:48 +02:00
Bob
d94a48b8c9 and here comes the LGPL 2022-07-10 20:51:20 +02:00
HbmMods
f90815897e
Merge pull request #670 from Voxelstice/oc-stuff
a fix of a bug and one more function to the oc compat thingy
2022-07-09 21:27:33 +02:00
Bob
dc0556ba30 what a funky 2022-07-09 21:27:20 +02:00
Voxelstice
e93a1f93b1
getSteam function 2022-07-10 04:43:07 +10:00
Voxelstice
1ad1601e96
fix the bug that removed fuel rods by accident 2022-07-10 04:42:13 +10:00
Bob
bae605d189 atlas texture 2022-07-07 23:23:36 +02:00
Boblet
7454e65d10 code cleanup, removed jon arbuckle mode, battery priority buttons 2022-07-07 17:00:25 +02:00
Bob
752a863559 tooltips for turret buttons, armor mod table, more lang keys
better gun smoke effect for atlas
2022-07-06 23:32:32 +02:00
Boblet
810f5d2680 fixed energy re-eval position collisions 2022-07-06 16:43:53 +02:00
Bob
7777fdb32a revolver animations 2022-07-05 22:46:32 +02:00
Boblet
f771345f88 a few more lang keys 2022-07-05 16:42:00 +02:00
Boblet
3ef639b106 optional headshot damage modifier, new fluid API for fritz 2022-07-04 16:53:25 +02:00
Bob
4293bddf12 brick by brick, suck my 2022-07-03 22:37:20 +02:00
Boblet
fca57450ac finished fallout config, some call list performance tests 2022-07-01 15:24:06 +02:00
Bob
d011ada90d battery fix, mass storage tiers 2022-06-30 22:58:26 +02:00
Boblet
69cd33a3d2 small config tweaks, fallout JSON reader 2022-06-30 16:59:34 +02:00
Bob
596decb191 fixed fallout, mini nuke 16" shells 2022-06-29 22:23:02 +02:00
Boblet
b0d7b16da3 NTL storage manifest, a bit more compat 2022-06-29 17:00:24 +02:00
Bob
f2f317eed3 JSON, what do the numbers mean, JSON 2022-06-29 00:23:33 +02:00
Boblet
3faed14975 furnace fix, fallout JSON config 2022-06-28 16:41:49 +02:00
Bob
10c9f7a121 FEnSU fix, power priorisation 2022-06-27 23:31:00 +02:00
HbmMods
4537a6e214
Merge pull request #644 from Doctor17-git/master
Updated ru_RU.lang
2022-06-26 21:53:02 +02:00
Doctor17-git
f2878b636b
Updated ru_RU.lang 2022-06-26 22:52:16 +03:00
Bob
e15f6d5d55 finished arty, conveyor improvements, chute fixes 2022-06-26 21:44:22 +02:00
HbmMods
407e00f70f
Merge pull request #636 from Vaern/hough
ZIRNOX Stuff, mostly
2022-06-24 11:42:06 +02:00
Boblet
2b59d8709e PR cleanup 2022-06-24 08:16:08 +02:00
HbmMods
bf2224b880
Merge pull request #641 from Adam29Adam29/master
Electric Furnace Rework
2022-06-24 08:10:45 +02:00
Bob
d6fc826ad8 i did nothing all day 2022-06-24 00:23:26 +02:00
Vaern
1d9c4fec33 amongusamongusamongusamongusamongusamongusamongusamongusamongusamongusam 2022-06-23 15:15:25 -07:00
HbmMods
415ea9470f
Merge pull request #634 from 7pheonix/glasscannon
Some bullshit regarding electrically powered guns + a funky one from the depths of my imagination
2022-06-23 08:33:29 +02:00
Boblet
4a3d93d756 Merge branch 'pr603' 2022-06-23 08:26:37 +02:00
Boblet
fde92737eb formatting 2022-06-23 08:26:05 +02:00
HbmMods
c019c4a923
Merge pull request #603 from Voxelstice/master
opencomputers support
2022-06-23 08:10:33 +02:00
HbmMods
aa9cd95681
Merge branch 'pr603' into master 2022-06-23 08:10:17 +02:00
HbmMods
c62c37efb3
Merge pull request #630 from Vaern/master
Recipe changes, messing with nuke items; a bite-sized PR, as a treat
2022-06-23 07:58:04 +02:00
Bob
90de2eabdc arty actually using the proper ammo types 2022-06-22 23:24:55 +02:00
Adam
5921a64c95
furnace container file 2022-06-22 21:14:47 +02:00
Adam
d7d7af3f6b
change of dualCookTime to progress 2022-06-22 21:12:25 +02:00
Adam
28f8b0be65
block furnace file 2022-06-22 21:11:05 +02:00
Adam
954839a2d1
accidental file 2022-06-22 21:09:27 +02:00
Adam
f4b0ba5bc2
added item tooltip for furnace 2022-06-22 20:58:58 +02:00
Adam
8138382c15
Tile entity Furnace file 2022-06-22 20:57:27 +02:00
Adam
580657c609
Block Furnace Textures 2022-06-22 20:55:51 +02:00
Adam
1c05d309b6
GUI Texture For Furnace 2022-06-22 20:53:57 +02:00
Adam
c380b7f84f
Merge branch 'HbmMods:master' into master 2022-06-22 20:45:04 +02:00
Boblet
aebcf90026 iron furnace fix, artillery shells 2022-06-22 16:58:48 +02:00
Bob
c98a011141 manual artillery contoller 2022-06-21 22:56:20 +02:00
Adam
093da728d2
i want to combust 2: electric boogaloo 2022-06-21 20:05:03 +02:00
Adam
905e2646ab
GUI electric furnace 2022-06-21 19:01:35 +02:00
Adam
916f295944
pain and even agony 2022-06-21 18:45:23 +02:00
Adam
c8c9d4af7e
i want to combust 2022-06-21 18:02:52 +02:00
Boblet
2952e175b5 fixes and fusion power ports 2022-06-21 16:56:51 +02:00
Vaern
aa7e20f3e2 localization & input fixes, fuel radiation modifier changed 2022-06-20 13:45:45 -07:00
Bob
0a017e9672 torex tweaks 2022-06-20 22:34:47 +02:00
Adam
879741a17c
progress bar issues 2022-06-20 22:33:04 +02:00
Boblet
e1b75a315e IO fixes, some arty work 2022-06-20 17:00:41 +02:00
Vaern
ffce09b080 Added l18n to ZIRNOX tooltips 2022-06-19 22:34:52 -07:00
Vaern
0c34901864 ZIRNOX stuff + lil bit of Igen
Added Mox ZFB rods for fast technetium breeding (50k ticks); Increased the lifetimes for almost all ZIRNOX fuels by approximately 2, along with minor changes to heat values; reduced buffs to boosted presto logs in the IGen: shouldn't be *as* broken anymore, but still nowhere near unremarkable; Added Hopper IO functionality to the ZIRNOX; Changed ZIRNOX and destroyed variant's model textures slightly
2022-06-19 22:23:18 -07:00
Bob
86a531cebe more arty stuff, conveyor fixes, crane retexture 2022-06-19 19:44:30 +02:00
Pheonix
b7ffa0f1d8 some garbage i almost forgot 2022-06-19 18:23:38 +01:00
Pheonix
fcfa5cee55 plentiful amounts of dosh 2022-06-19 18:11:16 +01:00
Vaern
43049bb730 Fixed the GC recipe for uranium fuel only having 2 UF nuggets, not 6 2022-06-17 12:20:31 -07:00
Vaern
af35180620 changed the recipes a lil 2022-06-17 12:05:29 -07:00
Vaern
0ba7153334 Recipe changes, messing around with nuke items, remappings and ignored 2022-06-17 12:05:29 -07:00
Boblet
e9f144bac9 a tiny bit of arty stuff 2022-06-17 15:23:12 +02:00
HbmMods
0b511f604f
Merge pull request #621 from Vaern/GC-Rework-Pt2
Gas Centrifuge Rework Part Two: Righting my Wrongs Boogaloo
2022-06-17 13:41:31 +02:00
HbmMods
eb565f1b2f
Merge branch 'master' into GC-Rework-Pt2 2022-06-17 13:41:24 +02:00
Bob
caa6b31b93 finished iron furnace, artillery turret 2022-06-16 22:59:28 +02:00
Boblet
34d72b4f80 iron furnace, some universal code for solid fuels 2022-06-15 16:54:45 +02:00
Bob
c307d26752 iron furnace 2022-06-14 22:56:06 +02:00
Boblet
f003b2db08 some stuff™️ 2022-06-14 16:59:33 +02:00
Bob
0e3be93bcb fixed canister color + version bump 2022-06-13 17:42:19 +02:00
Boblet
c50d01fedc fixes 2022-06-13 16:30:59 +02:00
HbmMods
ad6fe11d83
Merge pull request #626 from Doctor17-git/master
Updated ru_RU.lang
2022-06-12 21:16:47 +02:00
Doctor17-git
8d395e1658
Updated ru_RU.lang 2022-06-12 21:55:29 +03:00
HbmMods
fa176c6a5c
Merge pull request #623 from Voxelstice/turbine-anim
turbine blades now fade in/out when spinning
2022-06-12 20:48:58 +02:00
Bob
8c1275206c and all that jazz 2022-06-12 20:47:20 +02:00
Voxelstice
8dfe52b895
and the large turbine 2022-06-12 05:26:14 +10:00
Voxelstice
4bd1ccddf2
chungus 2022-06-12 05:24:46 +10:00
Boblet
debb9449cb working ejector crane upgrades 2022-06-10 15:24:46 +02:00
Bob
9a54fc537e some crafting recipes or sth 2022-06-09 23:20:16 +02:00
Boblet
22746a54e9 spring cleaning, conveyor lift 2022-06-09 16:55:41 +02:00
Bob
d29d58e14f conveyorception 2022-06-08 23:47:47 +02:00
Boblet
087ce9fccb double sided belts and missing mapping magic
my little mapping: remapping is magic
2022-06-08 16:45:57 +02:00
HbmMods
cd502ccf19
Merge pull request #619 from Vaern/RBMK-Stuff
Modified RBMK fuels, added effects for boron/foam on RBMK and ZIRNOX
2022-06-08 08:06:00 +02:00
Vaern
bb94a2db42 Noticed some inconsistencies between xenon and non-xenon poisoned schrab
recipes
2022-06-07 17:41:47 -07:00
Bob
17712de204 know your gusics 2022-06-07 23:37:45 +02:00
Vaern
24b7720f6d added boron sand for flaming debris 2022-06-07 13:32:32 -07:00
Bob
67a9c91950 my head hurts 2022-06-07 21:08:11 +02:00
Boblet
8a080a037f stack matching settings for extractor crane 2022-06-07 16:05:31 +02:00
Bob
02761a12cf extractor filter, GUI 2022-06-06 21:16:18 +02:00
Vaern
cfe90f281a plenty more changes; RBMK rounding errors fixed 2022-06-05 20:32:47 -07:00
Bob
fd901c8aef finished inserter + basic extractor functionality 2022-06-05 20:54:15 +02:00
Vaern
671948754b Plenty of changes 2022-06-04 21:30:30 -07:00
Vaern
045dcaa79a not sure how that was missed 2022-06-04 16:15:23 -07:00
Vaern
f23c080db0 might as well 2022-06-04 14:40:05 -07:00
Vaern
e29616a83e Changed some stuff for the debris 2022-06-04 14:27:41 -07:00
Vaern
1379522918 Changed UEU heat 2022-06-04 13:25:08 -07:00
Vaern
2d47e51833 Changed probability 2022-06-04 12:26:15 -07:00
Bob
66663ca502 inserter crane 2022-06-04 21:24:17 +02:00
Vaern
e2df83d638 Made foam/boron sand work for all sides of RBMK debris 2022-06-04 11:32:19 -07:00
Vaern
48c8ab84db Modified RBMK fuels, added effects for boron/foam on RBMK and ZIRNOX 2022-06-03 20:40:25 -07:00
Boblet
e89464038b and the lord yoinketh away 2022-06-03 14:57:46 +02:00
HbmMods
abbef7b70d
Merge pull request #617 from Vaern/ThMEU-Balancing
ThMEU Balancing
2022-06-03 08:08:57 +02:00
Vaern
ba6c0a8bb7 Fixed the enrichment percentage and RBMK localization for MOX
Might as well!
2022-06-02 17:08:44 -07:00
Bob
1ae7160128 conveyor API stuff 2022-06-02 22:46:22 +02:00
Bob
e4c0336324 unbelievable, absolutely phenomenal 2022-06-01 21:16:09 +02:00
Bob
ed15803a42 smooth sailing on conveyor belts 2022-06-01 20:47:35 +02:00
Bob
baff99e481 particles that are actual particles 2022-05-31 22:28:12 +02:00
Boblet
f0b211dbff mass storages keeping inventory when broken, recipes 2022-05-31 16:49:18 +02:00
Bob
8d8116b3d0 i did nothing productive all day 2022-05-30 19:45:51 +02:00
Vaern
4bb86ebc0b ZIRNOX ThMEU Rebalancing
oops
2022-05-29 11:56:42 -07:00
Vaern
9b4ad0bde3 ThMEU Rebalancing 2022-05-29 11:52:31 -07:00
Bob
943e243573 the ferocious crafter 2022-05-29 15:49:14 +02:00
Bob
0535d3c49f the man 2022-05-29 00:57:08 +02:00
Boblet
26bcbcf7e0 it's an autocrafter 2022-05-27 14:54:45 +02:00
Bob
c616a64500 mass storage 2022-05-26 23:29:11 +02:00
Boblet
c27d9e152e desh crates, cleaned up crate code terribleness 2022-05-25 16:37:29 +02:00
Bob
7e7d062324 funnier minecarts 2022-05-23 23:15:12 +02:00
Bob
625b0c70ab dial for turning off meltdowns 2022-05-23 19:19:31 +02:00
Bob
93dee8ac82 fixes and fixes 2022-05-23 18:37:41 +02:00
Voxelstice
fe2df764dd
if this doesnt fix the conflict i dont know what i will do 2022-05-23 13:25:57 +10:00
Voxelstice
5b463d96d9
that didnt fix the conflict 2022-05-23 13:14:20 +10:00
Voxelstice
ac93e2c4b0
fix conflict 1 2022-05-23 13:12:06 +10:00
HbmMods
5dd75258ad
Merge pull request #609 from Doctor17-git/master
Updated ru_RU.lang
2022-05-22 19:19:29 +02:00
Doctor17-git
e81b8b52ab
Updated ru_RU.lang
updated russian localization
2022-05-22 20:18:20 +03:00
Bob
9158a54b13 fixed cart crafting 2022-05-22 18:34:01 +02:00
Bob
e4e4e00c30 recipes and sound loop fixes 2022-05-22 18:17:05 +02:00
Bob
ea9b41fce8 the lord yeeteth
and the lord yoinketh away
2022-05-21 21:29:45 +02:00
Boblet
3fed1d8d8d ported a few more machines to the new fluid API 2022-05-20 14:43:45 +02:00
Bob
c57031c5f0 nicer debug particles, a bit of assemfac stuff, cart fixes 2022-05-19 22:46:17 +02:00
Bob
a68cad7704 even more assemfac stuff 2022-05-18 21:59:13 +02:00
Boblet
c28d268a57 assemfac functionality 2022-05-18 16:27:38 +02:00
Bob
aa385f2a21 finished flare stack upgrades, more assemfac GUI work 2022-05-17 22:27:34 +02:00
Boblet
0bbacd5f25 ported even more machines to the new fluid system, flare stack upgrades 2022-05-17 16:29:37 +02:00
Boblet
8958f163d2 a little bit of assemfac 2022-05-16 16:53:10 +02:00
Bob
7d2227ff4b FUCKING BNUUY 2022-05-15 20:00:34 +02:00
Bob
aad0ee5a87 Merge branch 'pr605' 2022-05-15 00:57:00 +02:00
HbmMods
17e49d4404
Merge pull request #605 from haru315/generalized_spiral_point
use generalized spiral points algorithm
2022-05-15 00:26:59 +02:00
Vaern
54d0394fa0
RBMK rebalancing (#602)
* stuff

* Reverted HEP241 and americium fuels to their original value

* Changed plutonium pile rod's output + radiation values

The plutonium pile rod now outputs 2 RGP, 1 uranium billets instead of 3 RGP billets, with the change in radioactivity to reflect that. Considering the recent additions to the pile - and planned ones that allow for sophistication akin to Windscale and X-10 - it feels like a natural balancing change.

* Added adjustable segment sizes to seven segment displays,

made research reactor's control rod entry more noticeable and responsive

* Gave higher plutonium production to NU and MEU

Every other U-238 containing fuel has a fissile:fertile ratio of about 1:3, whilst NU and MEU have 1:12 and 1:6 respectively; as a result, there's going to be a higher chance of U-238 interacting with neutrons, meaning more plutonium. Since NU has a lower enrichment and therefore reactivity as well, its burnup will always be lower, leading to more weapons-grade Pu-239 overall compared to enriched fuels

* Deuterium + Tritium

* Added check to prevent constant power drain

when a deuterium machine cannot produce more heavy water, but still has enough input water and energy to process

* sorry, i'm clowning

* Fixed shadowed fields for deuterium machines

Deuterium towers did not consume the correct amount of energy, as a final called maxPower was used in the superclass instead of getMaxPower() directly

* Update ChemplantRecipes.java
2022-05-15 00:24:21 +02:00
Bob
8779cb3032 the allmighty flare stack 2022-05-15 00:10:01 +02:00
haru315
d65c2a7505 Minor corrections and moving code around, commenting out unused portions 2022-05-14 23:08:22 +09:00
Voxelstice
415b81f022
rbmk crane that only moves
the load function needs fixing as it doesnt work in opencopmuters :pain:
2022-05-14 21:11:07 +10:00
Voxelstice
c41244da58
getDepletion and getXenonPoison functions 2022-05-14 19:03:21 +10:00
haru315
17c742416f use generalized spiral points algorithm 2022-05-14 10:46:10 +09:00
haru315
5c08de449c use generalized spiral points algorithm 2022-05-14 09:47:37 +09:00
Boblet
47eb08dcd7 oops 2022-05-13 14:13:03 +02:00
Boblet
041b684d26 condenser and cooling tower block tooltip 2022-05-13 11:59:35 +02:00
Voxelstice
7165e208a0
Update TileEntityMachineReactorBreeding.java 2022-05-13 16:34:27 +10:00
Voxelstice
f0ba4776b3
Update TileEntityRBMKRodReaSim.java 2022-05-13 16:25:29 +10:00
Voxelstice
60b1e7fcb3
Update TileEntityRBMKRod.java 2022-05-13 16:25:14 +10:00
Voxelstice
e96cca77f4
Update TileEntityRBMKControl.java 2022-05-13 16:23:57 +10:00
Voxelstice
5be83ccee9
Update TileEntityMachineReactorBreeding.java 2022-05-13 16:22:51 +10:00
Voxelstice
24ef4617b9
Update TileEntityReactorResearch.java 2022-05-13 16:22:16 +10:00
Voxelstice
46adbf3273
Update TileEntityReactorZirnox.java 2022-05-13 16:20:40 +10:00
Voxelstice
cf93a0be4a
Update TileEntityCoreStabilizer.java 2022-05-13 16:16:56 +10:00
Voxelstice
9e5e601920
Update TileEntityCoreReceiver.java 2022-05-13 16:16:37 +10:00
Voxelstice
9c150f335b
Update TileEntityCoreInjector.java 2022-05-13 16:16:23 +10:00
Voxelstice
65276ac0b2
Update TileEntityCoreEmitter.java 2022-05-13 16:16:01 +10:00
Voxelstice
dec5e80e0f
Update TileEntityMachineFENSU.java 2022-05-13 16:13:52 +10:00
Voxelstice
2f650fca8d
Update TileEntityMachineBattery.java 2022-05-13 16:12:11 +10:00
Voxelstice
0f15465edb
Update build.gradle 2022-05-13 16:09:39 +10:00
Boblet
2b914628b5 watz connector + template fix 2022-05-12 17:00:04 +02:00
Bob
89a41d4859 finished assemfac animation and texture, magnus cartus 2022-05-11 22:47:33 +02:00
Boblet
eaa727536a windows 7 be gone 2022-05-11 16:25:12 +02:00
Boblet
f08cdb1359 minecart tests, assemfac stabby bois 2022-05-11 15:43:16 +02:00
Bob
bf578c6e99 fixed templates, minecart tomfoolery, assemfac model 2022-05-10 23:10:28 +02:00
Boblet
4628858d64 no more template shifting 2022-05-10 16:24:04 +02:00
Bob
416e2e6278 fixes 2022-05-08 21:42:23 +02:00
HbmMods
c0c083d62e
Merge pull request #599 from Doctor17-git/master
Updated ru_RU.lang
2022-05-08 12:09:41 +02:00
Doctor17-git
91c44b9c83
Updated ru_RU.lang 2022-05-08 13:04:21 +03:00
Bob
65812871a0 patching up a release 2022-05-08 11:39:21 +02:00
Bob
033fe07a90 more pointless garbage 2022-05-07 19:08:12 +02:00
Boblet
860d0c61a3 the ferocious muncher 2022-05-06 13:42:02 +02:00
Bob
f3837beb70 bugfixes 2022-05-05 23:06:44 +02:00
Boblet
3dfdacd45a more garbage nobody asked for 2022-05-05 16:06:34 +02:00
Bob
72051a71fc steel crate minecart for some reason 2022-05-04 23:01:02 +02:00
Boblet
9f7c95f79b tiny bit of more fluid IO stuff 2022-05-04 16:51:38 +02:00
Bob
3f02f23096 finished multi fluid ID 2022-05-03 23:05:46 +02:00
Boblet
bd66140b54 GUI fluid identifier 2022-05-03 15:45:00 +02:00
HbmMods
d3e713f977
Merge pull request #597 from Vaern/master
Magnifique
2022-05-03 08:23:09 +02:00
Vaern
31dddc8da1 Revert "yeah"
This reverts commit a1e9edd459a78455ecaca89d5e20b8c0826ddf2e.
2022-05-02 18:10:33 -07:00
Vaern
a1e9edd459 yeah 2022-05-02 18:07:56 -07:00
Vaern
7800b1d1e2 Merge remote-tracking branch 'HbmMods/master' 2022-05-02 17:51:41 -07:00
Vaern
9bf5082236 magnifique
delicious
2022-05-02 17:51:36 -07:00
HbmMods
80ad7be8c7
Merge pull request #596 from Vaern/master
it's just you and me
2022-05-02 10:59:11 +02:00
Vaern
e63afbee10 Merge remote-tracking branch 'origin/master' 2022-05-01 20:10:48 -07:00
Vaern
c3aee19b3a pile shenanigans pt. 2 2022-05-01 20:10:29 -07:00
Vaern
5c2c4d300e pile shenanigans 2022-05-01 20:10:29 -07:00
Vaern
71115ec066 pile shenanigans pt. 2 2022-05-01 20:10:18 -07:00
Bob
e12be50ce6 small fixes 2022-05-01 21:18:12 +02:00
Vaern
cc4b0d01c0 pile shenanigans 2022-04-30 23:07:14 -07:00
Bob
739a6b4b47 oh boy it's 2 in the morning 2022-05-01 01:38:26 +02:00
HbmMods
ef921967c0
Merge pull request #592 from Vaern/master
Schrab fuel & waste + HEN recycling, gas centrifuge gating rebalancing
2022-04-30 16:53:48 +02:00
Vaern
0316408cee there you go 2022-04-29 16:17:36 -07:00
Vaern
2c14cd6a74 oh yeah, for less CBT
this way the dosimeter should still be more useful whilst not being as bad
2022-04-28 19:39:12 -07:00
Vaern
d7ded5f2cb Schrab Fuel & Waste recycling, HEN recycling, GC gating rebalancing 2022-04-28 19:19:49 -07:00
Vaern
60fd084e80 Merge remote-tracking branch 'HbmMods/master' 2022-04-28 17:26:48 -07:00
Boblet
a77291528c configurable chemplant recipes 2022-04-28 13:21:51 +02:00
Vaern
aa29deec7d Revert "."
This reverts commit fe5d0ee3001ea34ab1f1f95e826abeb305513299.
2022-04-27 19:16:50 -07:00
Vaern
fe5d0ee300 . 2022-04-27 18:37:36 -07:00
Vaern
e1296cdd36 Merge remote-tracking branch 'HbmMods/master' 2022-04-27 17:30:20 -07:00
Bob
9328cbbd20 first working test for universal JSON recipes 2022-04-27 23:20:37 +02:00
Vaern
2a97d10cf6 tiny little baby pr 2022-04-27 08:43:59 -07:00
Vaern
890a47e64e Merge remote-tracking branch 'HbmMods/master' 2022-04-27 08:16:46 -07:00
Boblet
b01e260db9 universal system for JSON based recipe configuration 2022-04-27 16:50:34 +02:00
HbmMods
3b70d57dde
Merge pull request #577 from Ambersol13/master
Update SILEXRecipes.java
2022-04-27 08:47:59 +02:00
Vaern
b171943eb7 Merge remote-tracking branch 'HbmMods/master' 2022-04-26 18:29:22 -07:00
Bob
2e3e47fce7 mug recipe 2022-04-25 21:27:47 +02:00
Boblet
bdfda34985 some heatex fixes 2022-04-25 16:51:14 +02:00
Vaern
b350beabaa Merge remote-tracking branch 'HbmMods/master' 2022-04-24 17:36:49 -07:00
HbmMods
fc79135be8
Merge pull request #584 from Doctor17-git/master
Updated ru_RU.lang
2022-04-24 22:07:04 +02:00
Doctor17-git
493e49bac0
Updated ru_RU.lang 2022-04-24 22:49:42 +03:00
Bob
079045c48f well if it isn't sussy jack 2022-04-24 21:03:19 +02:00
HbmMods
22aa659299
Merge pull request #580 from Vaern/master
Generator for small- to medium-sized structures based on MapGenStructure
2022-04-24 10:57:37 +02:00
Vaern
fc3f779408 dude 2022-04-23 21:02:32 -07:00
Vaern
aa59eedf7d well that's annoying 2022-04-23 20:58:16 -07:00
Vaern
c2d4b8734f Merge remote-tracking branch 'HbmMods/master' 2022-04-23 20:12:00 -07:00
Vaern
0ba3b93e56 argh 2022-04-23 20:11:53 -07:00
Bob
98b0f46afe obj util better color multiplication, an affront to god 2022-04-24 00:01:53 +02:00
Vaern
cd7650fdda a 2022-04-23 14:32:50 -07:00
Vaern
56f97e531c Merge remote-tracking branch 'HbmMods/master' 2022-04-23 14:28:57 -07:00
Vaern
ad504471c8 merci 2022-04-23 14:28:41 -07:00
Vaern
1a444c0b82 AAAAAAAAAAAAAAAAAA 2022-04-22 22:18:05 -07:00
Boblet
5f1c5cc5ba a bit of fluid IO, tooltips for hadron power plugs 2022-04-22 15:24:48 +02:00
Vaern
d3fe07f0df goddamn you 2022-04-21 20:07:11 -07:00
Vaern
115431ae00 mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
yes, workshop
2022-04-21 20:06:38 -07:00
Bob
85165e0621 large door, some more fixes 2022-04-21 23:34:51 +02:00
Boblet
bc98b85c19 fluid IO stuff once again, press preheater 2022-04-21 16:11:28 +02:00
Vaern
ab007b9ab6 ar 2022-04-20 19:43:34 -07:00
Vaern
c191374d51 Merge remote-tracking branch 'HbmMods/master' 2022-04-20 17:48:01 -07:00
Vaern
c70f4937b4 a 2022-04-20 17:47:58 -07:00
Bob
a6e1d49861 finished charger, nicer HUD overlay text 2022-04-20 22:31:18 +02:00
Vaern
c0fe1e7443 lovely 2022-04-20 09:51:13 -07:00
Boblet
21cb84817e suit charger (not the HEV yet) 2022-04-20 16:53:55 +02:00
Vaern
bdef28d482 mmmmmmm mmmmm mmmmmmmmmmmmmmmmmm mmmmmmmm mmmmmmmmmm mmmmmmmmmmmmmmmmmmm
sandstone structure number 2
also why the hell can commit names be this long???
2022-04-19 19:51:30 -07:00
Boblet
2387cc13e7 some more fluid IO work 2022-04-19 16:16:04 +02:00
Boblet
68efe9f28e why is it called a quarternion when you quarter in the cold food out hot
eat the food?
2022-04-19 14:28:41 +02:00
Vaern
3d80d62f2b arg 2022-04-18 19:47:05 -07:00
Bob
0412ac6154 finished new RBMK column, more fluid IO stuff 2022-04-18 22:52:07 +02:00
Ambersol13
ebb94d208c
Update SILEXRecipes.java
Added Schrabidium fuel recycling
2022-04-18 10:11:39 -04:00
Vaern
83d6a8e081 Merge remote-tracking branch 'HbmMods/master' 2022-04-17 20:47:20 -07:00
Vaern
7a8dd5b06a another day, another structure 2022-04-17 20:47:13 -07:00
HbmMods
6bbebdc65a
Merge pull request #576 from Doctor17-git/master
Updated ru_RU.lang
2022-04-17 22:04:44 +02:00
Doctor17-git
bfdd44d289
Updated ru_RU.lang 2022-04-17 23:03:22 +03:00
Bob
5f222a90e9 i love my mug root beer 2022-04-17 21:57:34 +02:00
Vaern
46eab51836 h 2022-04-16 21:18:01 -07:00
Vaern
1addf7da9a mortal trolling 2022-04-16 13:57:04 -07:00
Vaern
b32d6bb5a1 a 2022-04-15 21:14:11 -07:00
Boblet
4549924dfd RBMK heating column, heat exchanger, mug root beer coolant
and regular coolant too i guess
2022-04-15 15:07:17 +02:00
Boblet
646d22b4e4 fixed radiolysis machine crashing when running too fast 2022-04-15 08:02:36 +02:00
Vaern
9152678320 mapgen fundamentals 2022-04-14 21:04:06 -07:00
Vaern
26e74562bc Merge remote-tracking branch 'HbmMods/master' 2022-04-14 20:04:42 -07:00
Bob
218b43933e some fixes, upgrade retexture 2022-04-14 23:43:27 +02:00
Boblet
94c394152a baby mode -> less bullshit mode, more config options, more effects 2022-04-14 13:00:11 +02:00
Boblet
f62695bab1 more fluid net stuff, sulfuric acid bucket fix 2022-04-13 16:43:17 +02:00
Boblet
db259a9fdc some fixes 2022-04-12 16:00:19 +02:00
Boblet
4d2bda7820 better hadron diagnostics, chemplant + thermal cache fix (?) 2022-04-11 16:17:46 +02:00
Vaern
ee7642e825 Merge remote-tracking branch 'HbmMods/master' 2022-04-10 13:09:35 -07:00
HbmMods
23eee96fae
Merge pull request #568 from Doctor17-git/master
Updated ru_RU.lang
2022-04-10 21:38:57 +02:00
Doctor17-git
6fc6738171
Updated ru_RU.lang
updated russian localization
2022-04-10 22:38:10 +03:00
Bob
00d066f493 models, fixes, funky concrete, literally just weed 2022-04-10 21:17:21 +02:00
HbmMods
c4dedae3e4
Merge pull request #565 from Vaern/master
rebalancing part two
2022-04-10 10:49:32 +02:00
HbmMods
7e34465a45
Merge pull request #564 from 7pheonix/master
there is no electrolyser in Ba sing se
2022-04-10 10:46:56 +02:00
HbmMods
8b0ce5ed61
encoding pain 2022-04-10 10:44:47 +02:00
Bob
8ac0544727 and all that 2022-04-10 10:39:55 +02:00
Vaern
d9a5dc46ec rebalancing part 2 2022-04-09 20:11:47 -07:00
Pheonix
49d81ef3da the (un)binding of isa(d)a(sh)c
asbcc ascdsvcac scaociac c
2022-04-10 00:49:49 +01:00
Pheonix
6dc3ebaf51 Merge remote-tracking branch 'upstream/master' 2022-04-09 23:28:44 +01:00
Pheonix
afe7188b29 yet more electrolysis funnies 2022-04-09 23:28:35 +01:00
Vaern
ff206be40a Merge remote-tracking branch 'HbmMods/master' 2022-04-08 16:43:13 -07:00
Boblet
5a5078f4e2 new pipe funnies 2022-04-08 14:59:27 +02:00
Pheonix
e25d0f4e86 Merge remote-tracking branch 'upstream/master' 2022-04-08 11:17:13 +01:00
Pheonix
48e6a08fcd finally beginning the electrolyser 2022-04-08 11:16:57 +01:00
HbmMods
0a9102661b
Merge pull request #559 from Vaern/master
bit of rebalancing
2022-04-08 09:40:02 +02:00
Vaern
7bfbd2a4ec o 2022-04-07 19:37:07 -07:00
Vaern
a1ed078fd6 ZIRNOX & Radiation & Nuke Part Rebalancing 2022-04-07 19:29:23 -07:00
Vaern
7d596b7d84 Merge remote-tracking branch 'HbmMods/master' 2022-04-07 16:14:35 -07:00
Boblet
07a73130ce oily debris recycling, new upgrade textures 2022-04-07 16:51:04 +02:00
Pheonix
9dc0d40c2b Merge remote-tracking branch 'upstream/master' 2022-04-07 09:52:21 +01:00
Bob
ded8b00310 new fluid net test 2022-04-06 20:33:57 +02:00
Boblet
62f819daca made tomb gas even funnier 2022-04-06 16:51:00 +02:00
HbmMods
cff229c5c4
Merge pull request #554 from Pvndols/master
Thorium fuel production in RBMK irradiation channel
2022-04-06 16:17:17 +02:00
HbmMods
7b65976a12
Merge pull request #547 from Doctor17-git/master
Updated ru_RU.lang
2022-04-06 16:16:56 +02:00
Boblet
4071fc87bb cleaned up some configs, more radiation config options 2022-04-06 13:32:17 +02:00
Boblet
c40ba15023 spicy ME drives 2022-04-06 11:53:28 +02:00
Bob
7d3a4d197b funky NEI handling memes, arsenic 2022-04-05 20:30:29 +02:00
Pvndols
6d5d0b855b Thorium fuel production in RBMK irradiation channel
i hope i didn't fuck shit up
2022-04-05 11:41:29 +02:00
Boblet
a3398eb416 "show all recipes" button for universal NEI handlers 2022-04-04 15:58:06 +02:00
Boblet
ce7e6d07b2 finished cable debugger, disabled bidirectional re-eval 2022-04-04 13:03:24 +02:00
Boblet
7cb0bec184 proxy tiles work with re-eval, network debugger item 2022-04-04 11:19:23 +02:00
Doctor17-git
86903e8a2e
Updated ru_RU.lang 2022-04-03 21:55:55 +03:00
Vaern
569d393fff Merge remote-tracking branch 'HbmMods/master' 2022-04-03 11:07:21 -07:00
HbmMods
27b9948b2b
Merge pull request #546 from Vaern/master
pull request withdrawal symptoms
2022-04-03 19:57:34 +02:00
Bob
086e17d1a9 bunch of fixes, some configs 2022-04-03 19:56:34 +02:00
Vaern
f4ddd51b0a
Merge branch 'HbmMods:master' into master 2022-04-03 08:42:27 -07:00
Vaern
e69f403f15 radiolysis buff 2022-04-03 08:42:54 -07:00
Bob
80667f5eed minecraft doesn't crash for 10 seconds challenge (100% impossible) 2022-04-01 22:23:53 +02:00
Bob
6280d92a83 oh the log spam 2022-04-01 19:10:44 +02:00
Bob
58c1236ab5 finished classic cable 2022-04-01 19:07:06 +02:00
Boblet
115cc07af8 more world gen configs, classic cable renderer half done 2022-04-01 15:26:13 +02:00
Bob
1478664109 fixed mappings and broken textures 2022-03-31 22:54:10 +02:00
Vaern
db93e52b6c Merge remote-tracking branch 'origin/master' 2022-03-31 12:52:02 -07:00
Vaern
2d2fee0074
Merge branch 'HbmMods:master' into master 2022-03-31 12:44:26 -07:00
Boblet
6af5a8eb35 some small fixes, ore rendering with layers 2022-03-31 16:36:26 +02:00
Bob
c1b9ef3e17 fixed energy voids, sulfuric acid puddles 2022-03-30 23:23:38 +02:00
Boblet
d05854f514 classic cable 2022-03-30 16:10:17 +02:00
Boblet
957b07cca3 more fluid API, tank labels (finally) 2022-03-29 16:39:54 +02:00
Bob
ff87b1a062 proper sulfuric acid 2022-03-28 23:55:03 +02:00
HbmMods
8400098be0
Merge pull request #538 from Doctor17-git/master
Updated ru_RU.lang
2022-03-28 16:37:06 +02:00
Boblet
dcb7ad550c more fluidAPI, sulfuric acid, asbestos caves 2022-03-28 16:33:19 +02:00
Doctor17-git
202a31ff2f
Updated ru_RU.lang
aaaa
2022-03-28 10:01:40 +03:00
Vaern
b1054fe10c Merge remote-tracking branch 'HbmMods/master' 2022-03-27 13:21:52 -07:00
Bob
6e3f40f0d2 test fluid ducts, hazard tweaks 2022-03-27 21:50:29 +02:00
Bob
d517d665df sulfur caves, new test pipe 2022-03-26 23:35:05 +01:00
Bob
c662895f8e implemented re-eval for power nets
this should keep power nets intact when links (i.e. cables) are removed instead of outright destroying them they are re-calculated. this should keep unloaded and cached links intact which would otherwise not reconnect on their own.
2022-03-22 14:48:02 +01:00
Pheonix
fc59b72425 Merge remote-tracking branch 'upstream/master' 2022-03-20 20:24:02 +00:00
Bob
8c005a39fb removed machine sound category 2022-03-20 16:12:18 +01:00
HbmMods
67e180ccb2
Merge pull request #531 from 7pheonix/master
i am screaming hel
2022-03-20 09:52:52 +01:00
Pheonix
2a1575c578 i really hope this doesn't break anything 2022-03-19 22:46:43 +00:00
Pheonix
4086b8633d Merge remote-tracking branch 'upstream/master' 2022-03-19 16:42:32 +00:00
HbmMods
b687aed5db
Merge pull request #530 from Doctor17-git/master
Updated ru_RU.lang
2022-03-19 14:40:54 +01:00
Doctor17-git
891b747e78
Updated ru_RU.lang
впвавпавпвавпвавпвавпавп
2022-03-19 16:34:47 +03:00
Bob
32de31874e fixes for chemplant IO, armor clipping, nuke furnace 2022-03-19 14:07:22 +01:00
Vaern
c47072ab1d Revert "Merge remote-tracking branch 'origin/master'"
This reverts commit e62144b627398e8e2fa39be3d686ee963fa631c1.
2022-03-18 19:22:20 -07:00
Vaern
e62144b627 Merge remote-tracking branch 'origin/master' 2022-03-18 19:22:05 -07:00
Vaern
b8132a2ac6 Merge remote-tracking branch 'HbmMods/master' 2022-03-18 19:21:04 -07:00
Bob
8c36f6e36d power diodes with configurable throughput 2022-03-18 16:44:38 +01:00
HbmMods
bfdd790faf
Merge pull request #524 from TehTemmie/master
Some small fixes
2022-03-17 18:48:30 +01:00
Bob
980fe377a0 ore layer system, new amat cell explosion, particle settings for jetpack 2022-03-17 18:33:17 +01:00
TehTemmie
fabdeb6947
Fixing another small mistake 2022-03-17 17:56:48 +08:00
TehTemmie
0138c145ad
Update ItemPlateFuel.java
Fixed a rounding error and order of operations error
2022-03-17 17:51:46 +08:00
TehTemmie
61ab7e156d
Update ItemRBMKRod.java
I should probably do this in a proper dev environment
2022-03-17 17:47:06 +08:00
Bob
abc87d6fa9 fixed chemplant IO crash, broken recipes 2022-03-15 21:06:08 +01:00
Boblet
99e01176b7 some fixes, infinite bounding box block 2022-03-15 15:51:30 +01:00
Bob
13c3250005 the new AT mine model nobody asked for 2022-03-14 22:45:04 +01:00
Pheonix
3e91094c8f Merge remote-tracking branch 'upstream/master' 2022-03-14 20:34:47 +00:00
Pheonix
adaf445d6c cleanup duty once again 2022-03-14 20:34:08 +00:00
Boblet
9368b68280 some fixes, a bit of the new fluid transfer code, updated forge to 1614 2022-03-14 16:34:52 +01:00
Pheonix
2f7bb54c3a aeugh 2022-03-13 22:15:56 +00:00
Bob
6782663205 fixed SPAS using wrong config for alt fire 2022-03-13 20:09:06 +01:00
Bob
05fb9f5919 my bals 2022-03-13 19:06:36 +01:00
HbmMods
60049322d3
Merge pull request #509 from Doctor17-git/master
Updated ru_RU.lang
2022-03-13 18:51:32 +01:00
Doctor17-git
3ae857a69c
Updated ru_RU.lang 2022-03-13 20:50:33 +03:00
Bob
ab3a11055a æ 2022-03-13 18:32:13 +01:00
Bob
52418ce769 finished steam suit, new gun models, detonator visuals, c4&semtex blocks 2022-03-13 18:15:51 +01:00
Pheonix
6d6712aa98 Merge remote-tracking branch 'upstream/master' 2022-03-12 20:26:51 +00:00
Pheonix
596ac5c300 Time, Doctor Freeman. Is it really that time, again? 2022-03-12 20:26:40 +00:00
HbmMods
bcb8d87326
Merge pull request #494 from MartinTheDragon/fast-fallout
Backport the faster fallout algorithm
2022-03-12 20:00:44 +01:00
Bob
caa9394a92 chemfac fluid IO finished, water cooling 2022-03-12 20:00:11 +01:00
HbmMods
0fe03d1e8f
Merge pull request #501 from 7pheonix/master
GORDON. WE. WILL. KICK. YOUR. ASS!!!
2022-03-12 10:06:27 +01:00
Pheonix
61a708efda AAAAAAAAAAAAAA 2022-03-11 19:34:26 +00:00
Pheonix
d2527be086 what the hell was that there for 2022-03-11 18:40:50 +00:00
Pheonix
0759ac8f68 Merge remote-tracking branch 'upstream/master' 2022-03-11 18:30:14 +00:00
Pheonix
68c075edfc Gordon doesn't need to hear all this 2022-03-11 17:30:21 +00:00
MartinTheDragon
fdfc7a40a4
Delay fallout chunks and adjust ore chances 2022-03-11 17:17:16 +01:00
Boblet
99cdbb9f03 finished semtex and c4 timed bombs, some more laser detonator stuff 2022-03-11 15:16:50 +01:00
Vaern
315b5ff4bc Merge remote-tracking branch 'HbmMods/master' 2022-03-10 17:10:43 -08:00
Vaern
a7fd72f76f Preliminary stuff
gonna have to make a gui and do packet fuckery for this, shouldn't be too hard
2022-03-10 17:10:37 -08:00
Bob
04e63544c7 functional chemfac, chemfac base texture finished, fluid net enhancement 2022-03-10 23:38:41 +01:00
HbmMods
8f8590bf99
Merge pull request #493 from MartinTheDragon/falling-nuke-serialization
Add serialization for EntityFallingNuke
2022-03-10 08:31:13 +01:00
Vaern
c5201dcc26 Merge remote-tracking branch 'HbmMods/master' 2022-03-09 19:38:22 -08:00
Vaern
9c0cc80805 very, very preliminary recipe stuff 2022-03-09 19:38:10 -08:00
Bob
dbce273e03 some more chemfac work, expanded fluid acceptor interface 2022-03-09 22:17:03 +01:00
MartinTheDragon
4cf9d64d8e
Make the fallout chunk precision self-adjusting 2022-03-09 18:38:47 +01:00
MartinTheDragon
1f28a7c9f5
Backport the faster fallout algorithm 2022-03-09 16:56:53 +01:00
Boblet
9477cf8b68 fortune support for ores, implemented mining plastic explosives (c4&sem) 2022-03-09 16:08:48 +01:00
Bob
717a947b53 better do that now 2022-03-08 22:33:09 +01:00
Bob
58d3178650 C4 now uses a finished ExVNT, chemmfac slot shenanigans 2022-03-08 22:21:28 +01:00
MartinTheDragon
cbb412ebff
Add serialization for EntityFallingNuke 2022-03-08 21:35:19 +01:00
Boblet
70299728da some fixes, finalized ExVNT code 2022-03-08 16:36:57 +01:00
Bob
47be4e97b6 what did i do to deserve this 2022-03-07 19:33:53 +01:00
Boblet
c9872349fe fixed small syntax error, C4 and semtex charge models 2022-03-07 15:39:42 +01:00
Boblet
d3cf2cb43d test for new sound loop system 2022-03-07 13:47:06 +01:00
Bob
9471d66c6e chemfac, look overlays on some machines, some bugfixes, 2022-03-06 18:59:04 +01:00
Vaern
42f6778b86 aaaaaa
i can't be bothered
2022-03-05 11:45:05 -08:00
Vaern
e461ee6b2a Merge remote-tracking branch 'HbmMods/master' 2022-03-05 08:55:47 -08:00
Boblet
f8cb3ee1ed test sound category, V1 speed, steam suit using steam, armor cleanup 2022-03-04 13:38:35 +01:00
Vaern
e43704190c Merge remote-tracking branch 'HbmMods/master' 2022-03-02 15:59:56 -08:00
Bob
c3b2838e7a small amounts of trolling 2022-03-02 22:32:53 +01:00
Boblet
833e028aa2 some quackery, missing chemplant features and barrel yeet implementation 2022-03-02 15:53:06 +01:00
Boblet
35201ed420 removed excessive markDirty operations from hadron and RBMK 2022-03-01 13:09:13 +01:00
Boblet
6441aee9d3 handheld barrel yeeting 2022-03-01 11:55:32 +01:00
Bob
d5650da0cb CCC dependency - bottom text 2022-02-28 21:15:28 +01:00
Bob
7a34d437f0 the bear and the bull and the bear and the bull and the bear and the bul 2022-02-28 21:10:40 +01:00
Boblet
d4af867832 fixed chemplant accepting fluids in output, some new sound stuff 2022-02-28 16:58:24 +01:00
Bob
ca72f41ba8 laser detonator model + UV 2022-02-27 22:38:05 +01:00
Vaern
061ac4d5a9
Merge branch 'HbmMods:master' into master 2022-02-27 09:51:35 -08:00
HbmMods
f43192d7c9
Merge pull request #467 from Doctor17-git/master
Updated ru_RU.lang
2022-02-27 17:03:21 +01:00
Doctor17-git
74e81f29ae
Updated ru_RU.lang 2022-02-27 19:01:24 +03:00
Bob
d3b3cb64b7 more recipe handlers, some fixes, finished RPA, fixed furnace NEI 2022-02-27 16:32:41 +01:00
Boblet
8fab1b25d0 plastic blocks, heat energy values for fluids, more explosive sticks 2022-02-25 13:12:31 +01:00
Bob
7bfd36230d fixed some stuff, finished meta fluid canister, lubricant recipe 2022-02-24 21:21:38 +01:00
Bob
b055bcd703 Auto stash before merge of "master" and "origin/master" 2022-02-24 19:15:44 +01:00
Boblet
72fad8d2de metadata canisters, more leaded fuels, more certus quartz yield 2022-02-24 16:22:01 +01:00
Boblet
092f312c9f redstone power switches 2022-02-23 15:59:52 +01:00
Boblet
e619042446 c4 and semtex timed explosives, slight recipe tweaks 2022-02-23 14:18:26 +01:00
Boblet
5ed9d3126f chemplant recipes for TNT and bakelite, rubber, C4, better chem icons 2022-02-23 10:37:04 +01:00
Vaern
5f28e5bac3 Merge remote-tracking branch 'HbmMods/master' 2022-02-22 16:12:20 -08:00
Boblet
d3d92f33c8 æügh 2022-02-22 08:35:33 +01:00
Vaern
a3f6c073a8
Merge branch 'HbmMods:master' into master 2022-02-21 14:10:18 -08:00
HbmMods
5dc3a90871
Merge pull request #455 from Doctor17-git/master
Updated ru_RU.lang
2022-02-21 22:17:39 +01:00
Doctor17-git
939bd04594
Updated ru_RU.lang 2022-02-21 21:28:47 +03:00
Vaern
ce34316e9c Merge remote-tracking branch 'HbmMods/master' 2022-02-21 10:21:29 -08:00
Bob
eb01c8792f reverted fluid fuckery, unfucked the chemplant 2022-02-21 19:13:50 +01:00
Vaern
7a395951c3 Merge remote-tracking branch 'HbmMods/master' 2022-02-21 09:11:55 -08:00
Boblet
adac3b1c53 finished new chemplant NEI handler 2022-02-21 16:27:48 +01:00
Boblet
96db3e6767 new chemplant item IO 2022-02-21 15:03:27 +01:00
Boblet
f0938e99e1 yummy ender juice 2022-02-21 10:39:06 +01:00
Bob
09e1b6b197 more chemplannt rework stuff, new templates, battery block fixes 2022-02-20 22:02:08 +01:00
Boblet
abb8c3aeba new chemplant fluid and energy IO 2022-02-18 13:43:12 +01:00
Boblet
50557e6d0a finished new chemplant functionality, cleared up some fluid network code 2022-02-17 16:43:05 +01:00
Boblet
05892abbe7 removed dead code, started chemical plant rewrite, refactoring 2022-02-16 16:53:06 +01:00
Boblet
78efaa49a1 more work on the new chemplant recipe handler 2022-02-15 16:51:54 +01:00
Boblet
c990f1dd81 some recipe magic 2022-02-14 17:00:47 +01:00
HbmMods
decc1ede6f
Merge pull request #442 from Doctor17-git/master
Updated ru_RU.lang
2022-02-14 12:36:50 +01:00
Doctor17-git
010c23351e
Updated ru_RU.lang 2022-02-14 14:05:10 +03:00
Boblet
bdb012d11b added efficiency tooltips to combustion engine blocks 2022-02-14 09:27:18 +01:00
HbmMods
91ba3d704c
Merge pull request #441 from Vaern/master
Starter Guide
2022-02-14 09:06:33 +01:00
Vaern
c01343cea6 almst forgor times two 2022-02-13 19:18:55 -08:00
Vaern
662414dc8a almst forogr 2022-02-13 19:16:56 -08:00
Vaern
764cb04ba9 Merge remote-tracking branch 'HbmMods/master' 2022-02-13 19:08:34 -08:00
Vaern
a4fae41717 guide book done 2022-02-13 19:08:31 -08:00
Bob
55012487f4 slam dunk diarrhea 2022-02-13 23:22:42 +01:00
HbmMods
d160f45c0a
Merge pull request #438 from Doctor17-git/master
Updated ru_RU.lang
2022-02-13 22:39:24 +01:00
Vaern
3b382ad8e4 Merge remote-tracking branch 'HbmMods/master' 2022-02-13 13:25:35 -08:00
Vaern
9fbdbf290e preliminary commit 2022-02-13 13:25:25 -08:00
Doctor17-git
0e0015a2e4
Updated ru_RU.lang 2022-02-14 00:22:04 +03:00
Bob
778ebe9e41 siege drill, bugfixes, you know the full program 2022-02-13 21:39:24 +01:00
Vaern
e0e7425a95 more pages 2022-02-12 21:38:36 -08:00
Vaern
6b49faa862 Merge remote-tracking branch 'HbmMods/master' 2022-02-11 19:58:19 -08:00
Vaern
42fced08c5 liquidized trolling 2022-02-11 19:58:13 -08:00
Boblet
d4a044a147 more generic explosion code, sticks of TNT 2022-02-11 15:19:54 +01:00
Vaern
0e3ae4994a a 2022-02-10 19:45:44 -08:00
Vaern
c5cfdd4d4a Merge remote-tracking branch 'HbmMods/master' 2022-02-10 19:45:05 -08:00
Vaern
bdae2d94ba Reworked Guide book system + more pages
Should be a lot more flexible if UFFR ever makes his faction guide
2022-02-10 19:44:59 -08:00
Bob
9ce9daaea9 actual TNT blocks, toolboxes, transparent fluids in GUIs 2022-02-10 22:49:36 +01:00
Boblet
53264514f4 the great over-engineered vanilla-like explosion code 2022-02-10 16:57:49 +01:00
Boblet
949ca4010e energy converters now feature state-of-the-art recursion brakes! 2022-02-10 15:17:27 +01:00
Boblet
f127621093 toolbox, desh hand tools 2022-02-10 10:24:13 +01:00
Vaern
f8a11d3d33 starter guide beginnings 2022-02-09 19:46:15 -08:00
Vaern
efd1325e8f Merge remote-tracking branch 'HbmMods/master' 2022-02-09 17:51:45 -08:00
Bob
481e28f68b some siege tunneler work, finished dynamite block, meteor ingots in NEI 2022-02-09 23:42:07 +01:00
Boblet
68ed3f1d36 block of dynamite, classic TNT baseclass, cracking rec for crack diesel 2022-02-09 16:15:03 +01:00
Bob
ae2e169609 electric zapper for the siege UFO miniboss 2022-02-08 21:59:42 +01:00
Boblet
417969fe83 organized tile entities, upgrades for solidifier and liquefactor 2022-02-08 15:47:54 +01:00
Boblet
edb78440ca makes use of the pistol bullet model, transparency for water in GUIs 2022-02-08 11:05:33 +01:00
Bob
a7921b73e0 fixed solar boiler not saving, patched up oil recipes and fluid textures 2022-02-07 22:37:17 +01:00
Boblet
9002a295df salient green: the wonder of life in liquid, sticky form 2022-02-07 13:52:58 +01:00
Boblet
274262436d updated some petrochemistry recipe handling 2022-02-07 11:01:33 +01:00
HbmMods
1541eedd37
Merge pull request #429 from Vaern/master
MKU & Final ZIRNOX Balancing
2022-02-07 08:13:28 +01:00
Vaern
2734b0ed92 MKU + Final Zirnox Balancing 2022-02-06 17:31:02 -08:00
Vaern
32621f5826 Merge remote-tracking branch 'HbmMods/master' 2022-02-06 11:33:30 -08:00
Bob
da664a9414 some texturework, NBT-driven kits 2022-02-06 20:17:05 +01:00
HbmMods
aa0d33171e
Merge pull request #427 from Vaern/master
Well that's really inconvenient
2022-02-06 12:03:00 +01:00
Vaern
90daf9583d Merge remote-tracking branch 'HbmMods/master' 2022-02-05 15:12:34 -08:00
Vaern
4b8ba5b614 infobox funnies 2022-02-05 15:05:59 -08:00
HbmMods
700734c007
Merge pull request #426 from Vaern/master
Hopefully final ZIRNOX changes
2022-02-05 23:25:04 +01:00
Bob
48d1ee2f1c remnants power armor 2022-02-05 23:22:17 +01:00
Vaern
7c938db267 a 2022-02-05 09:40:28 -08:00
Vaern
01da3adc3f Merge remote-tracking branch 'HbmMods/master' 2022-02-05 09:38:30 -08:00
Vaern
81f5393192 Merge remote-tracking branch 'origin/master' 2022-02-05 09:38:20 -08:00
Vaern
4c8f951f25 my balls 2022-02-05 09:38:13 -08:00
Boblet
647fb8e8ac backported some 1.12 compat code 2022-02-04 15:08:21 +01:00
Boblet
b17fb8f6e8 standardized fuel values (yay new fluid handler) 2022-02-04 13:42:48 +01:00
Boblet
f12ca92932 threw out all the old fluid rendering code 2022-02-04 09:30:10 +01:00
Bob
247eaccc90 some minor UV work, made transission seals not crashy 2022-02-03 22:39:27 +01:00
HbmMods
e407f33c85
Merge pull request #424 from MartinTheDragon/factorials
UFFR wants factorials, ...
2022-02-03 18:24:28 +01:00
MartinTheDragon
9d0f0d4f78
Add factorial support to the calculator 2022-02-03 15:48:28 +01:00
Boblet
f222672523 transition seal (well most of it) 2022-02-03 15:39:49 +01:00
Bob
2538a071ce NEI handler, fixed new fluid rendering 2022-02-03 00:03:13 +01:00
Boblet
b31a465a08 FluidType child classes for flammability and combustion properties
"the enums were better because uhhh switches" well can your enums do this?
2022-02-02 16:49:06 +01:00
Boblet
94cbdd2555 version bump and breeder fix on NTM-main 2022-02-02 10:04:32 +01:00
Boblet
b8ea92eb2a post merge cleanup 2022-02-02 09:07:24 +01:00
HbmMods
be5b6a1cd2
Merge pull request #420 from Vaern/master
I can do anything
2022-02-02 08:55:38 +01:00
Vaern
6b81452c91
Last minute balancing changes 2022-02-01 19:58:01 -08:00
Vaern
e8034a86b0 Hell yeah!
The ZIRNOX Rework works, the gas cent nei handler works, the hazard issue should probably work, the guis should work
2022-02-01 19:51:33 -08:00
Vaern
78445883bb Merge remote-tracking branch 'HbmMods/master' 2022-02-01 16:59:13 -08:00
Bob
a2e0edc466 solidifier model, version 2 2022-02-01 23:15:17 +01:00
Boblet
b5b67a7085 the solidification recipes got out of hand and i accidentally added all
those crack oil products i was talking about oops
2022-02-01 16:03:24 +01:00
Boblet
1253a88e3e PR #419 2022-02-01 08:01:35 +01:00
Vaern
a52bbfda60 holy fuck
the gas centrifuge is pure spaghetti, the zirnox will not cooperate with the rework, i'm doing this tomorrow
2022-01-31 19:44:16 -08:00
Vaern
227bb059da Merge remote-tracking branch 'HbmMods/master' 2022-01-31 15:58:38 -08:00
Bob
b1c5c23615 fixed potential liquefactor NPE, cursed vanilla code 2022-01-31 22:35:49 +01:00
Boblet
f4a2d72e5a fixed colored concrete recipes, some solidifier code
removed the math question from the issue template because it didn't really achieve anything
2022-01-31 15:46:55 +01:00
HbmMods
1c40dbbe1f
Merge pull request #415 from Doctor17-git/master
Updated ru_RU.lang
2022-01-31 07:57:20 +01:00
Vaern
7c1f9ad078 Balancing my behated
The crux of the issue is that every energy buff for moderate and low-power pellets is a buff for the insanely good ones, but every energy nerf for the insanely good ones is a killing blow to the moderate and low-power ones, so I've opted to just nerf the insanely-good ones directly
2022-01-30 20:26:54 -08:00
Vaern
9ca0d83933 trolling: troll harder 2022-01-30 20:09:12 -08:00
Vaern
387071735c Merge remote-tracking branch 'HbmMods/master' 2022-01-30 13:03:27 -08:00
Vaern
ba51590bda trolling 2022-01-30 13:03:21 -08:00
Doctor17-git
f2cab10bb2
фф 2022-01-31 00:01:12 +03:00
Doctor17-git
efc9bf9576
Updated ru_RU.lang 2022-01-30 23:59:47 +03:00
Bob
2dca6ac757 patching up some garbage, recipes and lang keys 2022-01-30 21:54:28 +01:00
Vaern
29774caf77 Merge remote-tracking branch 'HbmMods/master' 2022-01-30 08:46:26 -08:00
Bob
49d1528eca finished liquefactor (minus the upgrades) 2022-01-30 14:53:07 +01:00
Vaern
fbeabb708b ag agagagag 2022-01-29 22:45:25 -08:00
Vaern
a2ee16b02a
Merge branch 'HbmMods:master' into master 2022-01-29 22:07:37 -08:00
Vaern
1e7cf79789 radiolysis 2 2022-01-29 22:12:32 -08:00
Bob
474a729a47 liquefactor machine 2022-01-30 00:20:59 +01:00
HbmMods
be38d75119
Merge pull request #412 from MartinTheDragon/calculator
Calculator
2022-01-29 18:01:06 +01:00
Bob
fb28b5cf16 bufferless HE to RF converters 2022-01-29 17:50:50 +01:00
MartinTheDragon
fd940b59c8
Add in-game calculator 2022-01-29 16:16:15 +01:00
Bob
081df1c8fe fluid duct agony 2: revengeance 2022-01-29 11:28:20 +01:00
Vaern
6014609f9f
Merge branch 'HbmMods:master' into master 2022-01-28 20:15:17 -08:00
Vaern
0922478262 radiolysis 2022-01-28 20:20:12 -08:00
Doctor17-git
6af53f5b1c
Updated ru_RU.lang 2022-01-28 18:48:11 +03:00
Boblet
b05384f2e5 fluid duct agony 2022-01-28 15:15:03 +01:00
Boblet
fdcf09abfb pheo's ivy mike GUI, det cord is now cord shaped, as the name implies 2022-01-28 10:43:58 +01:00
Boblet
da45bb91c8 floppenheimer (it's the FEL) 2022-01-28 09:37:18 +01:00
HbmMods
7bb1c2d17c
Merge pull request #406 from Vaern/master
flashlead
2022-01-28 08:18:34 +01:00
Boblet
9f92785ec6 fixed skybox chainloader 2022-01-28 08:04:05 +01:00
Vaern
cf540b7e23 Merge remote-tracking branch 'origin/master' 2022-01-27 18:43:21 -08:00
Vaern
d5a52327bc ghiorsium inserts 2022-01-27 18:43:14 -08:00
Vaern
73b6a078e5
Merge branch 'HbmMods:master' into master 2022-01-27 18:37:56 -08:00
Bob
6954dcf993 some more burrowing entity base code, stinger rocket textures 2022-01-27 21:51:55 +01:00
Boblet
d075730108 experimental bufferless RF to HE converter 2022-01-27 14:45:51 +01:00
Boblet
fc5d675586 merged pheo's stinger upgrade 2022-01-27 09:56:43 +01:00
Vaern
951fa48325 Ghiorsium cladding, Mercury small drops, ItemCustomLore Revamp 2022-01-26 20:09:25 -08:00
Vaern
a490935a44 Merge remote-tracking branch 'HbmMods/master' 2022-01-26 16:21:51 -08:00
Bob
0287066b81 siege skeleton 2022-01-26 23:36:06 +01:00
Boblet
33bfb9d928 variable protection yield ranges for FSB armor 2022-01-26 16:58:24 +01:00
Boblet
b17a1a9cd8 more oredict improvements, coke and tar variants, missing RBMK fuel rads 2022-01-26 15:26:16 +01:00
Vaern
2632b93980
Merge branch 'HbmMods:master' into master 2022-01-25 17:08:36 -08:00
Vaern
9afe37aed6 ghiorsium 2022-01-25 17:13:33 -08:00
Bob
134a594525 turbine tweaks, fixed some localizations 2022-01-25 22:33:12 +01:00
Boblet
ae6a39fdc7 siege drill basecode, some GUI util stuff 2022-01-25 16:34:19 +01:00
Vaern
64e36f3e5e flashlead funnies 2022-01-24 19:57:12 -08:00
Bob
21a9427933 quackos ammo, siege drill UV 2022-01-24 23:11:26 +01:00
Boblet
68abd44cfe experimental sine RBMK fuel, render distance safeguard + config 2022-01-24 16:58:36 +01:00
Boblet
7daceac39f better hadron errors, RBMK fuel depletion slopes, mud recycling 2022-01-24 11:59:47 +01:00
Bob
9294758fef siege UFO miniboss 2022-01-22 22:05:18 +01:00
Boblet
458500f35e some improved damage handling code for armor 2022-01-21 15:21:16 +01:00
HbmMods
503e5169bc
Merge pull request #396 from Vaern/master
reacher funnies
2022-01-21 08:49:06 +01:00
Vaern
046b531e8b
Swapped reacher functions
thanks temmie
2022-01-20 21:31:37 -08:00
Bob
b3bf7f0f50 siege dropship functionality, particle effects 2022-01-20 22:50:33 +01:00
Boblet
dbef397738 more siege logic, reduced garbage 2022-01-20 16:42:21 +01:00
Vaern
96d3020daa reacher funnies 2022-01-19 18:50:30 -08:00
Bob
3d1990a916 more laser bois 2022-01-19 22:26:27 +01:00
Boblet
ddca005edb siege mode lasers, pew pew 2022-01-19 16:41:19 +01:00
Bob
de6663fea9 balancing memery, fixed AoE axes breaking bedrock for good 2022-01-18 23:34:26 +01:00
Boblet
b68f9395e8 i rember 2022-01-18 16:54:45 +01:00
Boblet
9cc9c4d451 siege mode controller & gamerules 2022-01-18 16:36:01 +01:00
HbmMods
6622921c06
Merge pull request #394 from Doctor17-git/master
Updated ru_RU.lang
2022-01-17 23:02:43 +01:00
Bob
2ea60af5a4 GUI tweaks 2022-01-17 23:02:06 +01:00
Bob
8ef2e4f030 wake me up (wake me up inside) i can't wake up (wake me up inside) 2022-01-17 19:03:43 +01:00
Boblet
f653aae6d3 once more with feeling 2022-01-17 15:13:17 +01:00
Doctor17-git
ef0788191e
Updated ru_RU.lang 2022-01-17 15:26:44 +03:00
Boblet
e70b9b195a uncrashed servers, unbroke fluid strings 2022-01-17 09:13:25 +01:00
Bob
f5bfbd22dc post merge fixes 2022-01-16 21:39:41 +01:00
HbmMods
f731e0dc2d
Merge pull request #393 from Vaern/master
balancing
2022-01-16 21:24:19 +01:00
Bob
39d57c61a0 the lorax, i mean borax 2022-01-16 21:21:51 +01:00
Vaern
038b0455b3 h 2022-01-15 13:07:52 -08:00
Vaern
df8e6c7eb3 actinium funnies 2022-01-15 11:37:02 -08:00
Vaern
d51aab761d
Merge branch 'HbmMods:master' into master 2022-01-15 10:09:19 -08:00
Vaern
3b0763ee9d Last-minute balancing changes 2022-01-15 10:14:03 -08:00
Bob
c9e683bb32 borax, some small fixes, timed mining charges, PR cleanup 2022-01-15 16:54:21 +01:00
HbmMods
50aae39fca
Merge pull request #387 from Vaern/master
Pu238be plate fuel, lead-200 changed to lead-209
2022-01-15 12:11:01 +01:00
Vaern
88bae364ea
Merge branch 'master' into master 2022-01-14 19:09:26 -08:00
Vaern
c7b7106f97 RTG Decay
you don't play game so they are easy do you
2022-01-14 19:11:10 -08:00
Boblet
bd2063c86f The great fluid engoodening part 4
i think that's enough for today
2022-01-14 15:17:07 +01:00
Vaern
78d97fa2b9 WIP RTG shit 2022-01-13 20:30:29 -08:00
Boblet
ac54cc18b9 The great fluid engoodening, part 3 I think 2022-01-12 16:08:55 +01:00
Vaern
1d2a076543 Last-minute balancing changes
UFFR convinced me
2022-01-11 21:08:39 -08:00
Vaern
ee74a4f65e changed spicy lead, added pu238be plate fuel, rebalancing
i'm slightly tilted, since i had to change pb-200 to pb-209, but on the other hand it allows for it to be spicy af
2022-01-11 21:04:46 -08:00
Bob
4a395504cd just like 800 errors left
i will build a time machine, go back to the year 2017 and shoot my former self in the head
2022-01-11 23:40:34 +01:00
Boblet
ab1c6b2d81 this one will hurt a lot
obvious errors in this one, don't try to build it lmao
2022-01-11 17:00:37 +01:00
HbmMods
d003335c5c
Merge pull request #385 from Vaern/master
Fixes + Lead-200
2022-01-11 09:34:40 +01:00
Vaern
f57aa44a41 Fixes + Lead-200 2022-01-10 19:13:03 -08:00
HbmMods
8c33358c1c
Merge pull request #383 from Doctor17-git/master
Updated ru_RU.lang
2022-01-09 21:23:02 +01:00
Doctor17-git
476f7265fe
Updated ru_RU.lang 2022-01-09 23:21:27 +03:00
Bob
e66397ca8a finished substation, proxy TE shenanigans 2022-01-09 21:19:23 +01:00
HbmMods
8f1afce7b3
Merge pull request #380 from Vaern/master
itemhazard's death
2022-01-09 11:05:34 +01:00
Vaern
efe4974242 cleanup 2022-01-08 16:55:40 -08:00
Vaern
aef1de7ba9 itemhazard's death 2022-01-08 16:43:34 -08:00
Bob
6b873b0c81 minor cleanup 2022-01-08 17:52:11 +01:00
HbmMods
2c081af511
Merge pull request #376 from Vaern/master
Research Reactor
2022-01-08 17:03:11 +01:00
Vaern
5937794baf trolling 2022-01-06 15:58:42 -08:00
Vaern
28666ecabd Merge remote-tracking branch 'origin/master' 2022-01-05 18:29:36 -08:00
Vaern
e1b9c6f6f5 bit of fixes 2022-01-05 18:29:32 -08:00
Vaern
292d167d61 i am clowning 2022-01-05 16:25:00 -08:00
Vaern
ba91aef9b4
Update WeaponRecipes.java 2022-01-05 16:23:45 -08:00
Vaern
9b97a7dc3a
Merge branch 'HbmMods:master' into master 2022-01-05 16:16:42 -08:00
Vaern
bb9d444920 ugh
only doing this to appease bob, but what can you do
2022-01-05 16:21:15 -08:00
Bob
49a07b6b74 yeah whatever 2022-01-06 00:24:55 +01:00
Vaern
66ed3ce371 seems to be done 2022-01-04 17:33:13 -08:00
Vaern
5829d5e4cf aa 2022-01-03 19:37:14 -08:00
Vaern
58502b4b23 ah 2022-01-02 21:17:43 -08:00
Vaern
d3e36fafe4 Merge remote-tracking branch 'origin/master' 2022-01-02 09:42:15 -08:00
Vaern
5547ac4914 aaaaa 2022-01-02 09:42:10 -08:00
Vaern
e5ccf3979d
Merge branch 'HbmMods:master' into master 2022-01-02 09:36:28 -08:00
Bob
05b6d9b95a detonator improvements, large pylon, more dynamite 2022-01-02 18:33:40 +01:00
Vaern
26e1c36dac stuff 2022-01-01 14:15:42 -08:00
Vaern
2f9abdf00f Merge remote-tracking branch 'origin/master' 2022-01-01 10:36:22 -08:00
Vaern
a06fff46ba seven segment displays work! 2022-01-01 10:36:15 -08:00
Vaern
8de85238ac
Merge branch 'HbmMods:master' into master 2022-01-01 10:31:19 -08:00
Bob
734d1fc66d the large boys 2022-01-01 19:30:52 +01:00
Vaern
e0fb379b53 breeding reactor funnies 2021-12-31 23:20:59 -08:00
Vaern
f4650eeb45 more small reactor funnies 2021-12-30 22:37:30 -08:00
Vaern
3efe87becd
Merge branch 'HbmMods:master' into master 2021-12-30 13:34:53 -08:00
Vaern
bee5c6d0ea merge attempt 2021-12-30 13:39:27 -08:00
Bob
65830d76d1 some pylon memes, spent fuel pool NEI handler 2021-12-30 18:46:05 +01:00
Vaern
e40ea77e3b preliminary small reactor revamp 2021-12-29 22:48:07 -08:00
Vaern
e67d9546f0
Merge branch 'HbmMods:master' into master 2021-12-29 22:42:14 -08:00
Vaern
9be7a1f378 attempts to merge 2021-12-29 22:46:40 -08:00
Bob
8037893637 that should hopefully resolve some garbage 2021-12-29 22:57:45 +01:00
Vaern
e0433a3174 Merge remote-tracking branch 'origin/master' 2021-12-28 17:40:27 -08:00
Vaern
a223f5662c fixes 2021-12-28 17:40:22 -08:00
Bob
2aaa426feb fixed batteries not disconnecting, acidizer output stacks 2021-12-26 22:05:44 +01:00
Doctor17-git
2d30098b5a
Updated ru_RU.lang 2021-12-26 23:12:06 +03:00
HbmMods
cbc620f646
Merge pull request #372 from Doctor17-git/master
Updated ru_RU.lang
2021-12-26 21:02:42 +01:00
Doctor17-git
86e821e48c
Updated ru_RU.lang 2021-12-26 23:00:52 +03:00
HbmMods
d4c04926f5
Merge pull request #371 from Vaern/master
New Achievements!
2021-12-26 20:50:21 +01:00
Vaern
a63686237d
Merge branch 'HbmMods:master' into master 2021-12-26 11:46:10 -08:00
Bob
7967275373 anvil NEI handler, some minor adjustments 2021-12-26 20:45:33 +01:00
Vaern
06166483b7 pile shenanigans 2021-12-25 21:39:38 -08:00
Vaern
b8067eee66 radium rtg pellet 2021-12-25 19:32:55 -08:00
Vaern
b141ccbb40 minor fixes 2021-12-24 14:07:32 -08:00
Vaern
fa0d6adc66 Centrifuge bobcode removed + debris shredding 2021-12-22 12:47:17 -08:00
Vaern
5f6fed5571
Merge branch 'HbmMods:master' into master 2021-12-22 11:52:59 -08:00
Vaern
218cc2bf02 Merge remote-tracking branch 'origin/master' 2021-12-22 11:57:19 -08:00
Vaern
00aa419e98 a few more achieves 2021-12-22 11:57:14 -08:00
Boblet
ced90d7874 bound new centrifuge model, some fluid preparations 2021-12-22 15:53:18 +01:00
Vaern
97d0a67eef Achievements!
now with an actual progression and even more witty descriptions
2021-12-21 17:28:00 -08:00
Vaern
cdbf5ba588
Merge branch 'HbmMods:master' into master 2021-12-21 17:24:58 -08:00
Bob
6a83d3ffb2 dynamite, dosimeter fix, new gas centrifuge model 2021-12-21 22:52:04 +01:00
Boblet
43a9f2802e dosimeter, some texture upgrades 2021-12-21 15:57:59 +01:00
HbmMods
e2af06b02b
Merge pull request #369 from Vaern/master
Fix for nullpointerexception for gas centrifuge
2021-12-21 08:10:12 +01:00
Vaern
67c5555876 Merge remote-tracking branch 'origin/master' 2021-12-20 19:15:47 -08:00
Vaern
e15bc80a07 fixed nullpointer exception 2021-12-20 19:15:37 -08:00
HbmMods
a415dfecac
Merge pull request #368 from Vaern/master
Gas Centrifuge Rework
2021-12-20 21:01:47 +01:00
Vaern
58d2a64165 fixed hardcoding 2021-12-20 08:31:54 -08:00
Boblet
5ff7bf2dec fixed RTG pellets using old values 2021-12-20 16:39:43 +01:00
Vaern
04b23c3ef9 Thank god I caught that early 2021-12-19 18:15:24 -08:00
Vaern
41f582a1db Merge remote-tracking branch 'origin/master' 2021-12-19 18:03:59 -08:00
Vaern
10331011a7 whoops
whoops
2021-12-19 18:03:50 -08:00
Vaern
96000abaa2 Gas cent's done! 2021-12-19 18:01:05 -08:00
Vaern
5af357f94f
Merge branch 'HbmMods:master' into master 2021-12-19 17:57:33 -08:00
HbmMods
87b95f4702
Merge pull request #367 from Doctor17-git/master
Updated ru_RU.lang
2021-12-19 20:49:54 +01:00
Doctor17-git
dd763f2d46
Updated ru_RU.lang 2021-12-19 22:46:25 +03:00
Bob
35a7ee8d31 a little bit of everything 2021-12-19 19:07:51 +01:00
Bob
8d07e34583 patched up MG42 2021-12-18 23:14:21 +01:00
Vaern
6cc9ba9cd8 gas cent!
yay
2021-12-17 22:28:03 -08:00
Vaern
65567ac961 Merge remote-tracking branch 'origin/master' 2021-12-17 17:43:36 -08:00
Vaern
0fa36839f6 Revert "self-charging rgp battery!"
This reverts commit 2499b7f8c11d84ce0354494410db15eae87af257.
2021-12-17 17:41:59 -08:00
Vaern
742dd54aa4 gas cent actually works!
yay
2021-12-17 17:41:48 -08:00
Vaern
996ba4545e Merge remote-tracking branch 'origin/master' 2021-12-16 19:38:25 -08:00
Vaern
df4bc5c32e gas centrifuge shenanigans
very, very WIP
2021-12-16 19:38:17 -08:00
Vaern
ce67beb3d1
Merge branch 'HbmMods:master' into master 2021-12-16 19:34:22 -08:00
Boblet
3b938c5873 funky xray marker renderer thing 2021-12-16 17:00:08 +01:00
Boblet
d6b741b54f ReC nuclear waste hazard compat, some missing textures 2021-12-15 16:06:58 +01:00
Vaern
da704ddd64 Merge remote-tracking branch 'origin/master' 2021-12-14 19:46:21 -08:00
Vaern
2499b7f8c1 self-charging rgp battery! 2021-12-14 19:45:57 -08:00
Vaern
2336f43978
Merge branch 'HbmMods:master' into master 2021-12-14 19:42:14 -08:00
Boblet
9e97a5caf5 some slight code refactoring, fun with enums 2021-12-14 16:12:03 +01:00
Boblet
bb513f3b9f GC and AR shredding recipes for moon turf 2021-12-13 16:22:13 +01:00
Bob
a6cc151c57 some small fixed, chinese localization 2021-12-12 23:09:05 +01:00
Vaern
4dded8894f Merge remote-tracking branch 'origin/master' 2021-12-11 11:40:21 -08:00
Vaern
86be818cfc Zirnox fixed!
hurrah
2021-12-11 11:40:14 -08:00
HbmMods
20eb5648bc
Merge pull request #364 from Vaern/master
Zirnox finally fixed
2021-12-11 20:37:44 +01:00
Vaern
3322c27bb3
Merge branch 'HbmMods:master' into master 2021-12-11 11:36:23 -08:00
Bob
f57d7f25e2 crucible UB, drillgon bobble, FEnSU fix 2021-12-11 17:13:30 +01:00
Boblet
721bb405eb copper clusters 2021-12-10 14:52:15 +01:00
HbmMods
6df784986b
Merge pull request #363 from TehTemmie/patch-2
Fixed rounding errors with large reactor
2021-12-10 08:46:15 +01:00
Bob
832660f8b0 fixed iGen render jank, giant blast furnace UV 2021-12-09 22:51:52 +01:00
Boblet
2507880cb9 put the mg42 model in the right spot 2021-12-09 16:47:36 +01:00
Bob
4509cdece3 fixed RTGs not outputting 2021-12-08 23:14:46 +01:00
TehTemmie
2a6480c35d
Fixed rounding errors with large reactor
Large reactor rods only affected heat produced (which in turn affects steam production) in increments of 10% (for example, 19% control rod level produced the same heat as 10%) while still consuming more fuel. This change (hopefully) fixes that error, assuming it wasn't intentional. (Yes, I suck at pull requests)
2021-12-07 20:16:25 +08:00
Bob
779796d4df MG-42 2021-12-06 19:06:58 +01:00
HbmMods
efe0ad736a
Merge pull request #359 from Doctor17-git/master
Updated ru_RU.lang
2021-12-05 20:40:45 +01:00
Doctor17-git
91bfe6b533
Updated ru_RU.lang 2021-12-05 22:36:35 +03:00
Bob
a77cf08818 igen 3: revenge of the sith 2021-12-05 20:33:56 +01:00
HbmMods
b54a36f716
Merge pull request #355 from Vaern/master
Some Radium + Ducrete Love & Rebalancing
2021-12-05 11:15:27 +01:00
Bob
43ba0f135d buffed RTGs, fixed loot block dropping, pylon cable length fix 2021-12-05 11:13:27 +01:00
Vaern
9695763605 ducrete love 2021-12-04 19:00:08 -08:00
Vaern
8c076968b4 Merge remote-tracking branch 'origin/master' 2021-12-03 19:42:46 -08:00
Vaern
9a5a597870 radium love and rebalancing 2021-12-03 19:42:40 -08:00
Boblet
608023ee4c simplified some ItemBlock tooltip code, added tooltips 2021-12-03 14:47:56 +01:00
Bob
1b18c5d810 cable connector model, a lot of energy net fixes 2021-12-02 22:46:03 +01:00
Bob
9ba3dbb792 fixed depleted fuel disappearing out of the ZIRNOX and spent fuel pool 2021-12-01 21:43:05 +01:00
Boblet
18d4d091e5 pylon connector rotation, crafting recipe 2021-11-30 16:18:59 +01:00
HbmMods
5d8b186c29
Merge pull request #345 from Vaern/master
fixed very glaring rounding error
2021-11-30 09:47:19 +01:00
Vaern
bb575d9f61
Merge branch 'HbmMods:master' into master 2021-11-29 16:25:47 -08:00
Bob
c51b2bfb93 small pylon connector 2021-11-29 22:10:20 +01:00
Boblet
bc3fd09b44 buffed combustion engines and geothermal w/ lava, more slime w/ beheader 2021-11-29 16:22:22 +01:00
Boblet
816db93991 made nukes more destructive in close proximity, concrete cracker now...
...works as advertised (changes untested, ugh)
2021-11-29 08:53:26 +01:00
Vaern
61aea864fa steam function fixed once and for all 2021-11-28 14:27:22 -08:00
Vaern
6cf657ef22
Merge branch 'HbmMods:master' into master 2021-11-28 13:45:57 -08:00
Vaern
cbca9cdb11 fixed very glaring rounding error
goddamn how did i miss that
2021-11-28 13:48:48 -08:00
HbmMods
1a65245f72
Merge pull request #343 from Vaern/master
Zirnox and other minor fixes
2021-11-28 20:05:53 +01:00
Vaern
c5e0023c07 Merge remote-tracking branch 'origin/master' 2021-11-28 10:49:41 -08:00
Vaern
22ab528db8 whoops 2021-11-28 10:49:34 -08:00
Vaern
c4a7efc23d Merge remote-tracking branch 'origin/master' 2021-11-28 10:43:10 -08:00
Vaern
453184e07a Much needed fixes 2021-11-28 10:43:01 -08:00
Vaern
f93dab38f2
Merge branch 'HbmMods:master' into master 2021-11-28 10:39:59 -08:00
Bob
f47dd0c2c0 fixed getting blood bags while being invincible 2021-11-28 19:27:06 +01:00
Boblet
0579ef7ad1 xp IV bags 2021-11-26 15:18:36 +01:00
Bob
0eb71db3a6 radaway recipes, simplified IV bag code 2021-11-25 22:54:00 +01:00
Boblet
337891905f hadron power plug crashfix, IV bag 2021-11-25 15:41:19 +01:00
Boblet
a224d56cae cable connections for old dummy port blocks 2021-11-24 16:22:06 +01:00
Bob
d0dc402ddd more big-headed plastic figurines 2021-11-23 23:32:35 +01:00
Boblet
dd6f7ec4f9 removed invtweaks garbage 2021-11-23 16:39:13 +01:00
Boblet
a2ab15a43d experimental invtweaks implementation 2021-11-22 11:10:37 +01:00
Boblet
8eb3e4ac2c ZIRNOX fixes, pheo's bobble 2021-11-22 10:26:48 +01:00
Bob
6aedf26a93 yum delicious garbage 2021-11-21 23:23:28 +01:00
Bob
fa78371f2b fixed a lot of the new power garbage, better pylons 2021-11-20 15:57:19 +01:00
Boblet
f39a6f9ca1 fixed deuterium machines, cable switch, added deprecation annotations 2021-11-18 15:59:54 +01:00
Boblet
3f731951ce The great energy massacre: Finale 2021-11-18 09:40:48 +01:00
Boblet
5b8d478c22 The great energy massacre part 3 2021-11-17 16:45:56 +01:00
Boblet
810786fa9d the great energy massacre part 2 2021-11-16 15:39:24 +01:00
Boblet
8539a9b830 the great energy massacre part 1 2021-11-15 16:57:57 +01:00
Boblet
cb1661f5d3 the last commit before the great energy massacre 2021-11-15 14:11:19 +01:00
Boblet
419a331f6d fixed some tasty garbage 2021-11-15 11:19:53 +01:00
Bob
bba17b713f russian locals 2021-11-14 19:58:16 +01:00
Bob
dcbd0acabf catalytic cracker, fixed some garbage 2021-11-14 19:50:40 +01:00
Bob
e2bd7abf7e catalytic cracker 2021-11-13 17:30:30 +01:00
Boblet
fdcde0dd69 recipe mercy, catalytic cracker model & UV 2021-11-12 15:16:38 +01:00
Bob
e54aedbee6 zirnox debris models 2021-11-11 20:45:01 +01:00
Bob
79394a84c8 patched up dead leaf particles, small fixes 2021-11-10 22:08:25 +01:00
Boblet
4804483913 battery delta display, rebalanced recipes with steel pipes, bobble fixes 2021-11-10 16:31:27 +01:00
Boblet
cbd99f6792 it's ZIRNOX time! 2021-11-10 10:48:21 +01:00
Bob
40f57dbcd5 yeah i forgot what i wanted to actually do 2021-11-09 19:34:57 +01:00
Boblet
fdc7f0e6ea hnngh 2021-11-09 16:30:25 +01:00
Boblet
4029b7cba6 lead tanks for nuclear waste fluids and other radioactive substances 2021-11-09 16:22:56 +01:00
Boblet
60d54086cf reliant robin space shuttle 2021-11-09 15:58:35 +01:00
Boblet
8d6575f967 fixed my drunk firearm balancing 2021-11-09 09:38:02 +01:00
Bob
81ec62be2e deuterium extraction tower, bobbleheads 2021-11-09 00:04:07 +01:00
Bob
f36f8ca826 Merge remote-tracking branch 'origin/master' 2021-11-06 18:26:40 +01:00
Bob
13aa7d8e4c fixed recipes, bobbleheads 2021-11-06 18:26:31 +01:00
Boblet
28e0e9ce19 RBMK profiling, fixed moderated rods reflecting, cleaned up RadGen fuels 2021-11-05 15:09:03 +01:00
Boblet
ea3862c84e fixed battery and SILEX handler 2021-11-04 14:32:36 +01:00
Boblet
49369733f4 ethanol 2021-11-04 08:55:55 +01:00
Bob
6af3e1c066 fixed some tom relatedstuff 2021-11-03 23:38:10 +01:00
Boblet
d59e69893c fixed cable rendering crash, oredictionary for consumable recipes 2021-11-03 16:43:46 +01:00
Boblet
4bf34653e1 merged PR #319 (that's the funny one) 2021-11-03 15:14:10 +01:00
Boblet
2471777d04 lunar miner, helium plasma 2021-11-03 09:17:53 +01:00
Bob
7f4b3e5b89 fixed plate recipes not loading 2021-11-02 19:06:24 +01:00
Boblet
efad0a8ff2 made guide book useful again, interface for diagnostic overlay 2021-11-02 16:38:55 +01:00
Boblet
2c9a36640d desh stamp recipes, fixed assembler recipes having too much copper dust 2021-11-02 16:04:55 +01:00
Boblet
47dec982ee new press recipe handler, desh stamps 2021-11-02 15:40:00 +01:00
Boblet
77eefbb1a7 more RTG pellets 2021-11-02 11:47:09 +01:00
Bob
4bfbdd8a76 fixed all that BS 2021-11-01 16:16:38 +01:00
HbmMods
1ed516975c
Merge pull request #325 from Doctor17-git/master
Updated ru_RU.lang
2021-11-01 12:30:17 +01:00
Doctor17-git
547f8c2ba6
Updated ru_RU.lang 2021-11-01 14:27:39 +03:00
Bob
84dee87160 how did this one even slip through 2021-11-01 12:12:51 +01:00
Bob
c75f8fe564 more oredicting, missing RTG blast furnace lang keys, small fixes 2021-11-01 12:12:31 +01:00
HbmMods
29687f339a
Merge pull request #322 from MartinTheDragon/fluid-duct-qof
Make marking pipelines easier and quicker
2021-10-30 17:59:20 +02:00
Bob
06b5c8b67d some more loot block rendering stuff, RTG blast furnace GUI 2021-10-30 17:54:39 +02:00
MartinTheDragon
78b9711fe8
Add info text to the fluid identifiers 2021-10-30 00:27:02 +02:00
MartinTheDragon
e20947af50
Make marking pipelines easier and quicker
Shift-right-clicking pipes with fluid identifiers will now change
connected pipes within a maximum distance of 64 blocks
2021-10-29 17:25:37 +02:00
Bob
c1d0447ec8 ow 2021-10-29 16:59:59 +02:00
Boblet
05cf279af4 finished RTG blast furnace, new chemplant recipe handling 2021-10-29 15:14:27 +02:00
Boblet
2d83fd5390 RTG blast furnace, the great oredictioning part 4 2021-10-28 16:51:00 +02:00
Bob
9fe1ec57b1 tested new power system again, new loot generator block 2021-10-27 23:56:43 +02:00
Bob
26b379e249 zirnox texture, some loot stuff, world gen tests 2021-10-24 15:52:53 +02:00
Boblet
aa320d25cb some assets, fixed AA shovel being a singularity 2021-10-22 15:23:55 +02:00
HbmMods
414cca55af
Merge pull request #315 from TehTemmie/patch-1
Reworked radiation math with the reacher equipped
2021-10-22 13:10:32 +02:00
Boblet
b4e458b0b8 new experimental fluid handling 2021-10-21 16:53:29 +02:00
Boblet
1db878628c the great oredictioning, part 3 2021-10-20 16:58:07 +02:00
Bob
4c1b5780d2 the great oredictioning, part 2 2021-10-19 22:36:47 +02:00
Boblet
1824f23841 Merge remote-tracking branch 'origin/master' 2021-10-19 14:24:33 +02:00
Boblet
5f3af9cb8c the great oredictioning, part 1 2021-10-19 14:24:21 +02:00
Bob
8667854e13 fixed crane crash 2021-10-18 18:16:28 +02:00
Boblet
48163f96ea added compat to reactorcraft hazmat suits 2021-10-18 16:49:45 +02:00
Boblet
39801c72b6 fixed crash on start, updated textures, more hazards 2021-10-18 16:28:31 +02:00
TehTemmie
4d38e301d1
Reworked radiation math with the reacher equipped
This change makes reachers reduce incoming radiation that is under 1 RAD/tick.
2021-10-18 19:07:54 +08:00
HbmMods
b9ca43d578
Merge pull request #313 from Doctor17-git/master
Updated ru_RU.lang
2021-10-17 22:11:35 +02:00
Doctor17-git
05df66c14e
Updated ru_RU.lang 2021-10-17 23:09:04 +03:00
Bob
c0fee87503 reworked the RadGen, updated swords, fixed hopper IO 2021-10-17 22:03:25 +02:00
Bob
ba7a3084ba RBMK crane is now functional 2021-10-14 19:47:00 +02:00
Boblet
223469bad7 some more crane functionality 2021-10-14 16:08:39 +02:00
Bob
8090108257 movable crane, crane texture, wokring keybinds 2021-10-13 23:24:00 +02:00
Boblet
83bb0fd16f crane keybinds, fixed debris not saving, a surprise 2021-10-13 16:45:41 +02:00
Boblet
c4eee6990d cleaned up meteor spawn code, protection charm armor mod 2021-10-13 13:49:56 +02:00
Bob
338541b884 ordered the lang entries 2021-10-12 23:16:43 +02:00
HbmMods
db2fb0c346
Merge pull request #309 from Adam29Adam29/master
Added LPG fuel and LPG Canister
2021-10-12 23:11:27 +02:00
Bob
025c6dc40c some more RBMK funnies 2021-10-12 23:10:32 +02:00
Adam
96bd907c11
LPG canister and chemplant icon 2021-10-12 20:53:40 +02:00
Adam
09b84d17fe
LPG Tank Image 2021-10-12 20:52:28 +02:00
Adam
d76fccd39e
LPG in Fluidhandler 2021-10-12 20:50:12 +02:00
Adam
e2071b340c
lpg texture 2021-10-12 20:33:42 +02:00
Adam
ab7f2c6f23
lpg chemplant recipe 2021-10-12 20:30:52 +02:00
Adam
850d35f573
lpg chemplant template 2021-10-12 20:28:59 +02:00
Adam
6c30d80877
lpg fuel funsies 2021-10-12 20:27:22 +02:00
Adam
66f0aff2aa
lpg fuel in diesel gen 2021-10-12 20:25:41 +02:00
Adam
80f0ce7e6e
lpg added into diesel gui 2021-10-12 20:03:33 +02:00
Adam
e97ea334dc
fillable lpg cans 2021-10-12 20:02:48 +02:00
Adam
99b0239013
lpg items 2021-10-12 19:59:42 +02:00
Adam
6052ea04c3
Add files via upload
lpg id
2021-10-12 19:54:46 +02:00
Adam
d4c7d4078b
Add files via upload
lpg icon and gas canister
2021-10-12 19:52:44 +02:00
Adam
2fbc18c490
Add files via upload
lpg tank texture,
2021-10-12 19:51:26 +02:00
Boblet
3ef96ad63b new RBMK columns 2021-10-12 16:35:34 +02:00
Bob
2b36cc8e0d RBMK crane console 2021-10-11 23:11:49 +02:00
Bob
6919dd038d finished RBMK display 2021-10-11 18:47:58 +02:00
Boblet
ebfa6912a0 finally the RBMK display, launch pad mercy, fixes 2021-10-11 16:59:59 +02:00
HbmMods
1920f634f0
Merge pull request #306 from Doctor17-git/master
Updated ru_RU.lang
2021-10-10 23:46:11 +02:00
Doctor17-git
6a7ae46834
1 2021-10-11 00:31:42 +03:00
Doctor17-git
9b2d048c06
Updated ru_RU.lang 2021-10-11 00:30:10 +03:00
Bob
07c3c8e27b all sorts of fixes 2021-10-10 23:27:17 +02:00
Bob
9b32f81883 fixed crates losing locks when mined, connected textures for glasses 2021-10-09 18:31:49 +02:00
Boblet
6cde27e91d fracksol chemplant recipe, oil spot indicators, HazardSystem debug spam 2021-10-08 15:20:40 +02:00
Bob
d19e073c41 connected pain has finally ended 2021-10-07 19:32:04 +02:00
Boblet
0da3781cff porous stone as bedrock oil indicator 2021-10-07 15:33:34 +02:00
Boblet
a297bf0f4c crates save contents, more connected pain, fixed mercury dupe with drums 2021-10-07 15:21:56 +02:00
Bob
114e5e1c9a connected pain is slightly less dysfunctional now, somehow 2021-10-06 23:57:45 +02:00
Boblet
bfeb0cb737 patched up the PR + some fixes 2021-10-06 16:38:11 +02:00
HbmMods
30765c5d11
Merge pull request #299 from Vaern/master
can't miss the everything is awful update 2.0
2021-10-06 15:59:37 +02:00
HbmMods
7edc660a77
Merge branch 'master' into master 2021-10-06 15:59:12 +02:00
Boblet
95bfb1c485 removed trash recipes, iGen recycling 2021-10-06 15:57:52 +02:00
Vaern
a0037e88fa adjusted pile a little bit 2021-10-05 20:15:00 -07:00
Boblet
64ea95b102 fixed broken recipes with red phosphorus 2021-10-05 16:55:56 +02:00
Vaern
8c89ea3969
Merge branch 'master' into master 2021-10-04 20:24:22 -07:00
Vaern
599e688598 rebalanced pile, added fibrosis treatment 2021-10-04 20:24:10 -07:00
Boblet
639b2745b8 shredder recipes, UV lamp class 2021-10-04 16:45:30 +02:00
Bob
f186ed7aea fixed logspam bs 2021-10-03 22:47:43 +02:00
HbmMods
ca8b156dcf
Merge pull request #300 from Doctor17-git/master
Updated ru_RU.lang
2021-10-03 22:46:36 +02:00
Doctor17-git
6a205d018e
Updated ru_RU.lang 2021-10-03 23:31:15 +03:00
Bob
52f55a8df5 fracking 2021-10-03 22:26:30 +02:00
Vaern
78cef1a099 adjusted the fibrosis values 2021-10-03 12:14:44 -07:00
Vaern
c2e002419f whoops 2021-10-02 15:57:40 -07:00
Vaern
6e32c9818d added pulmonary fibrosis 2021-10-02 13:37:44 -07:00
Bob
fa88b16c4c derrick rewrite, new pumpjack model, oil pump base code 2021-10-02 19:00:14 +02:00
Boblet
82911a9027 fixed SILEX recipes, ZFB textures, more ItemHazard entries & modifiers 2021-10-01 15:25:35 +02:00
Boblet
6eb7ebe021 fixed ore dict blunders, more connected pain 2021-09-30 14:31:44 +02:00
Bob
451014aad6 connected textures more like connected pain 2021-09-29 19:54:37 +02:00
Boblet
cf54665bbd even more CT garbage 2021-09-29 16:52:39 +02:00
Bob
9577435865 redid some recipes, fracking tower texture 2021-09-29 00:13:43 +02:00
Boblet
96fb78aa28 more broken CT garbage 2021-09-28 16:54:20 +02:00
Boblet
d59e27e73f first attempt at CT 2021-09-27 16:59:10 +02:00
Boblet
352394ad20 cigarettes, indestructible nuclear waste entities 2021-09-24 14:27:40 +02:00
HbmMods
9423fd47b9 Update issue templates 2021-09-23 13:40:22 +02:00
HbmMods
ce8e00c4ff Update issue templates 2021-09-23 13:38:43 +02:00
HbmMods
7e28e4a96c Update issue templates 2021-09-23 13:38:13 +02:00
Bob
be4183efc8 fixes, oredict and all that 2021-09-22 21:36:12 +02:00
Boblet
9932b377b3 brought back radiation world destruction, radfog, some more hazard types 2021-09-22 16:47:40 +02:00
Bob
a42974d61e fixed ore dict funnies, fractioning tower, new niobium powder textures 2021-09-21 22:31:37 +02:00
Boblet
e0e8898743 integrated hazard loading into the new ore dict manager 2021-09-21 14:26:53 +02:00
Boblet
e300c7dfe0 implemented missing types for new hazard system, fixed some recipes 2021-09-20 16:55:54 +02:00
HbmMods
6b2fe8f23c
Merge pull request #282 from Doctor17-git/master
Updated ru_RU.lang
2021-09-19 20:37:31 +02:00
Doctor17-git
e7d4fbe069
Updated ru_RU.lang 2021-09-19 21:36:36 +03:00
Bob
fc1a2f15a4 Fixes, particles for cooling towers 2021-09-19 20:30:16 +02:00
Bob
f9f1ed9d6b redid the entire oredict, recipes, more memepack stuff 2021-09-19 16:32:56 +02:00
Boblet
9d83a333fd new hazard system fully functional, hazard transformer classes 2021-09-17 14:45:19 +02:00
Boblet
383473ea86 some small hazmat compat, potatoes to poison shredder recipe 2021-09-16 16:59:49 +02:00
Boblet
4b7deebed3 dynamic, registry driven hazard system
now with 20% more ore dict!
2021-09-16 14:00:46 +02:00
Bob
d5c77d90b5 finished aux cooling tower, heavily reduced auto mining drill awfulness 2021-09-15 19:33:07 +02:00
Boblet
a29f1ab8f8 mask filter unscrewing, small cooling tower, bedrock ore improvements 2021-09-15 16:22:49 +02:00
HbmMods
fad8924b7d
Merge pull request #279 from Doctor17-git/master
Updated ru_RU.lang
2021-09-14 19:31:34 +02:00
Doctor17-git
f981d5e3a4
Updated ru_RU.lang 2021-09-14 20:30:20 +03:00
Bob
f8df240691 oops 2021-09-14 19:26:00 +02:00
Bob
9a2751b7a4 some more fixes, recipes, chemistry icons 2021-09-14 19:16:23 +02:00
Boblet
f2a4ee69cf finished large cooling tower 2021-09-14 16:57:54 +02:00
Boblet
10fc95c6ea fixed ore dict keys for recipes, fixed template folder terribleness 2021-09-14 10:55:15 +02:00
Boblet
af123ec386 528: compromise edition, UV lamp model, condenser, bedrock ore 2021-09-13 15:56:18 +02:00
HbmMods
059e2a1480
Merge pull request #276 from Doctor17-git/master
Updated ru_RU.lang
2021-09-12 22:00:44 +02:00
Doctor17-git
c61dcbafeb
Updated ru_RU.lang
updated russian localization
2021-09-12 22:57:07 +03:00
HbmMods
7e80be5e74
Merge pull request #275 from ShimmeringBlaze/SB'sLab
my life is pain, why did I decide to do this
2021-09-12 21:39:59 +02:00
Bob
f077b6f39f mostly finished new gas mask funnies, improved mask filters 2021-09-12 21:39:04 +02:00
Doctor17-git
111ce2509a
Updated ru_RU.lang 2021-09-12 18:51:07 +03:00
Shimmering Blaze
3bf4b2a2eb did I do that right? 2021-09-12 08:38:40 -06:00
Shimmering Blaze
803ab695bb lord and savior of UFFR 2021-09-12 08:33:00 -06:00
Shimmering Blaze
9ed127b982 my life is pain, why did I decide to do this 2021-09-11 17:19:58 -06:00
Boblet
ece74681ca coal stat for items, porous stone, volcano crash fix 2021-09-10 15:16:30 +02:00
Bob
f5ad04fcfa enhanced lung diseases, coughing fits 2021-09-09 22:58:58 +02:00
Boblet
7bcbfd4599 broadcaster mercy, siege mobs stuff, meteor clipping fix
and thus, meteors shall no longer move through roofs
2021-09-09 15:18:25 +02:00
Bob
0a40e5ae6c more memepack memery 2021-09-08 23:42:45 +02:00
Boblet
073bd2a8c4 memepack: return of the HIV 2021-09-08 16:58:25 +02:00
Boblet
474d3fc020 black lung, leaded gasoline, more gas mask funnies 2021-09-08 15:16:13 +02:00
Bob
f5f5f18f1c some more gas mask shenanigans 2021-09-07 19:33:11 +02:00
Boblet
efc382c9dc dynamic gas mask filters, cleanup, piss-soaked rags, recipe changes 2021-09-07 15:59:56 +02:00
Bob
34b7352f1f this has no right to be a commit but here we are 2021-09-06 00:04:29 +02:00
Bob
0cbdba9665 finished pile, bullet part anvil recipes 2021-09-05 16:12:53 +02:00
Bob
7a24c74435 tried and failed shader magic 2021-09-04 18:20:09 +02:00
Boblet
80a8883706 some firearm shenanigans 2021-09-03 15:19:28 +02:00
Bob
0eadbbc288 all hail the pile 2021-09-02 23:15:10 +02:00
Bob
cf0ad61bda Merge remote-tracking branch 'origin/master' 2021-09-02 18:29:29 +02:00
Boblet
ece2b63b7d hazmat armor classes 2021-09-02 16:59:35 +02:00
HbmMods
fe03c8155f
Merge pull request #268 from Enginecrafter77/master
Fixed messy codechicken maven libraries
2021-09-02 14:32:24 +02:00
Bob
4d435c90ab eternal fire in 528 mode, more pile stuff 2021-09-01 23:43:58 +02:00
Enginecrafter77
74babbead9 Fixed messy codechicken maven libraries
The codechicken maven libraries are now properly downloading sources along with the dev jars. Those source jars are automatically attached to the development jars, so you can see them in eclipse.
2021-09-01 16:48:09 +02:00
Boblet
d6f2cd97da slight tweak to the build system 2021-09-01 15:30:43 +02:00
HbmMods
c5401590f3
Merge pull request #267 from Enginecrafter77/master
Autonomized build system
2021-09-01 13:35:44 +02:00
Boblet
1fc61e2e2e more pile work, moved TE registration out of the main reg 2021-09-01 13:26:08 +02:00
Enginecrafter77
4e641e8e7c Added gradle git versioning
The gradle git versioning allows for effortless publishing of new releases just by adding a git tag. Release bumping commits are no longer required.
2021-09-01 13:02:29 +02:00
Enginecrafter77
6c63313842 Updated README to reflect build system changes.
The README now better describes the build process, even for inexperienced users.
2021-09-01 12:28:21 +02:00
Enginecrafter77
9a41ccc0ba Autonomized build system
The build system should now be fully autonomous. That means that the build should run just fine without any user intervention upon cloning the repository. The dependencies are now pulled from [modmaven](https://modmaven.dev) instead of assuming they're in local directory. This removes the need to download them manually for users building this repository from source. Update of README.md is strongly advised.
2021-09-01 11:54:38 +02:00
Bob
6365280f96 fixed graphite drilling, boron rod textures 2021-08-31 23:47:30 +02:00
Boblet
73fb241c2c plug and play graphite drilling funsies 2021-08-31 16:14:32 +02:00
Boblet
7a80e8d74f pile rod items, crafting recipes 2021-08-31 11:16:50 +02:00
Bob
06e600a2a4 enhanced drilling action 2021-08-30 23:58:40 +02:00
Boblet
961bcdec9c come and join the pile 2021-08-30 16:39:55 +02:00
HbmMods
f2d29f728a
Merge pull request #265 from Doctor17-git/master
Updated ru_RU.lang
2021-08-29 21:20:54 +02:00
Bob
9a9d7aa4ba "bumped version number" turns out i didn't. what happened? 2021-08-29 21:16:47 +02:00
Doctor17-git
6f77f60698
Updated ru_RU.lang 2021-08-29 22:16:03 +03:00
Bob
1c2a2a0c90 bumped version number 2021-08-29 21:13:41 +02:00
Bob
566534366e fixed radiation system, patched up item renderers, a bit of everything 2021-08-29 17:11:00 +02:00
Bob
4151ddac93 volcano types, recipe changes, ammo texture fix 2021-08-28 18:26:50 +02:00
Boblet
dd3a90793a fractioning tower model, ammo changes, gascent energy fix 2021-08-27 15:22:58 +02:00
Boblet
0e5db1d675 fractioning tower 2021-08-26 16:49:38 +02:00
Bob
4671ecbe4a crash fixes, oily boy 2021-08-25 23:29:50 +02:00
Boblet
35e6d6b5cd more API stuff, ore cluster functionality with auto miners 2021-08-25 09:36:09 +02:00
Bob
62d755432e patched up smelly turret 2021-08-24 23:30:41 +02:00
Boblet
59ccb1ebc2 howard dungeon variant 2021-08-24 15:14:16 +02:00
Boblet
0dca95c044 improved mushroom physics, UFFR assets, ducrete 2021-08-24 13:18:09 +02:00
Boblet
574c46995c IMC recipe support for centrifuges, slightly improved centrifuge TE
or rather, slightly reduced centrifuge horribleness

2015 bobcode *shivers*
2021-08-23 16:47:49 +02:00
Bob
b8f032ffda tantal(i)um powder, ore dict keys for Ta, flaming gold sand 2021-08-22 22:59:20 +02:00
Bob
9204fbea9b o r b u s 2021-08-22 18:15:26 +02:00
Bob
e72a963d38 IMC support for the acidizer, projectile protection for security armor 2021-08-21 18:42:29 +02:00
Boblet
4c95d1853a start of basic IMC implementation for acidizers 2021-08-20 14:20:24 +02:00
Boblet
7cbc863e39 fixed ore dict for red copper and neutron reflectors, IC2 compat config 2021-08-20 12:02:40 +02:00
Bob
2f9482a46b extraordinarily wide fluid storage 2021-08-19 23:07:21 +02:00
Bob
721edd302b some watz overhaul stuff 2021-08-19 00:04:07 +02:00
Bob
30b06bec46 please stop feeding my ComparableStacks with unregistered items :( 2021-08-16 23:27:12 +02:00
HbmMods
4c603298a7
Merge pull request #259 from Doctor17-git/master
Updated ru_RU.lang
2021-08-16 18:25:51 +02:00
Bob
674c248cac beb 2021-08-16 18:25:20 +02:00
Boblet
3eee7bfe58 X3962: Mistake Edition
v1v1v1v1v1v1v1v1v1v1v1v1v1v1v1v1v1v1v1v1
2021-08-16 10:14:09 +02:00
Doctor17-git
63cad201f6
Updated ru_RU.lang 2021-08-15 20:21:31 +03:00
Bob
a58a6dfd90 yoiu don't play games so they are easy do you ? 2021-08-15 18:57:41 +02:00
Bob
744c64bd81 reasim boilers, RBMK deco blocks, recipes 2021-08-15 14:59:26 +02:00
Boblet
55749552dd changed AMS recipes, removed power and exploding abilities 2021-08-13 11:49:05 +02:00
Bob
e5fb7c5a35 power net fixes, new cable designs 2021-08-12 22:13:53 +02:00
Boblet
a0237c9a40 better universal upgrade system, rebalanced upgrades, yay 2021-08-12 14:42:04 +02:00
Bob
41034075fd removed solstice's ability of using the hiddencat, ever 2021-08-11 23:37:55 +02:00
Bob
e4b9285eac functional power net NT 2021-08-11 23:13:22 +02:00
Boblet
acc48bf52c localisation and recipes 2021-08-11 16:44:03 +02:00
Boblet
c0b64abbeb patched up shredder recipe shenanigans 2021-08-11 13:47:09 +02:00
Boblet
48aa499cfb RBMK reasim boiler functionality 2021-08-11 10:26:07 +02:00
Bob
0ed5489e82 overhauled vomit physics 2021-08-10 23:39:00 +02:00
Boblet
3722844400 uninteresting, barely relevant garbage 2021-08-10 14:04:35 +02:00
Bob
5f272a906f adjusted bismuth amounts 2021-08-09 23:08:22 +02:00
Boblet
1a7f2b6091 self-charging cells 2021-08-09 15:44:11 +02:00
Boblet
de691fbe71 SILX automation, cleaned up radiation code 2021-08-09 14:02:46 +02:00
Bob
a2801ebb1c nuclear waste funnies, infinite water tank mk2, anvil stuff 2021-08-08 20:17:21 +02:00
Bob
d2c2bd4d3f Merge remote-tracking branch 'origin/master' 2021-08-07 17:51:58 +02:00
Bob
d5e3bf2559 minor amounts of tomfoolery 2021-08-07 17:51:51 +02:00
Boblet
f8f34852f3 damage type support for BulletNTs, better entity contamination 2021-08-06 11:27:18 +02:00
HbmMods
caecbb1d80
Merge pull request #250 from Doctor17-git/master
Updated ru_RU.lang
2021-08-05 19:16:16 +02:00
Doctor17-git
19d6c7a52a
Updated ru_RU.lang
updated russian localization
2021-08-05 20:06:38 +03:00
Bob
9935584617 patching this up 2021-08-05 19:04:17 +02:00
Boblet
cf9f837c20 new satellite designator, cancer medication, funny darts 2021-08-05 15:23:18 +02:00
Bob
22dca2d355 shredder model, fixed pylon cable lighting 2021-08-04 23:11:53 +02:00
Boblet
358f8a1d43 fixed pylons being garbage 2021-08-04 16:26:52 +02:00
Boblet
f9da6e1d58 a lot of small stuff, FEL, anvil and shredder recipes 2021-08-03 16:15:13 +02:00
Boblet
768c5a4fde some small fixes 2021-08-02 16:36:17 +02:00
HbmMods
7944494d74
Merge pull request #247 from Doctor17-git/master
Updated ru_RU.lang
2021-08-01 19:39:14 +02:00
Doctor17-git
d30761670e
Updated ru_RU.lang 2021-08-01 20:36:51 +03:00
Bob
f6efeb12c8 and now for more anvil stuff 2021-08-01 19:26:29 +02:00
Bob
b86cdaf1e6 i worked all day and achieved nothing 2021-07-30 20:43:05 +02:00
Bob
c626f58582 volcanoes! 2021-07-29 20:38:46 +02:00
Bob
41b980a26a extremely crappy MK5 prototype that i wasted all day on 2021-07-28 21:21:07 +02:00
Bob
42ebdbb3c6 depth rock pickaxe, decorative stones, gas improvements, s'mores 2021-07-27 19:50:39 +02:00
HbmMods
32727c9fa2
Merge pull request #241 from Doctor17-git/master
Updated ru_RU.lang
2021-07-26 17:06:31 +02:00
Doctor17-git
9105de552e
Updated ru_RU.lang
updated russian localization
2021-07-26 17:42:08 +03:00
Bob
3038daf4c1 versioning 2021-07-26 16:13:58 +02:00
HbmMods
89d8d8fb9c
Merge pull request #239 from MartinTheDragon/patch-1
Bullet Press Stamps are Shredder Blades
2021-07-26 16:07:38 +02:00
Bob
4a38426e4a fixed RBMK console crashing, anvil NEI handlers, cobalt ore 2021-07-26 16:06:23 +02:00
MartinTheDragon
9b13c1a88d
Bullet Press Stamps are Shredder Blades
Whilst implementing Shredder Blades in the 1.16.5 version, I found that, in fact, bullet press stamps are shredder blades, and will also work as such.

I did not create a build of this version, but I only changed four lines from `ItemBlades` to `ItemStamp`.
2021-07-24 21:10:48 +03:00
Bob
5afdabd2c2 flight fix, new textures, bismuth extractor, 528 mode recipes 2021-07-24 17:03:56 +02:00
Bob
2d44d78c8f fixed schist gen, wing hover mode, cloud residue rendering 2021-07-22 21:26:37 +02:00
HbmMods
922963871f
Merge pull request #237 from Doctor17-git/master
Updated ru_RU.lang
2021-07-20 20:23:59 +02:00
Doctor17-git
1751313e4c
Updated ru_RU.lang
updated russian localization
2021-07-20 21:18:54 +03:00
Bob
09ede50f01 and finally 2021-07-20 20:11:46 +02:00
Bob
fc3bccf604 and whatever 2021-07-20 20:11:00 +02:00
HbmMods
a1ae551395
Merge pull request #235 from Doctor17-git/master
Updated ru_RU.lang
2021-07-18 21:56:52 +02:00
Doctor17-git
c1bf193248
Updated ru_RU.lang 2021-07-18 22:54:33 +03:00
Bob
de904dc381 and then the rest 2021-07-18 21:48:47 +02:00
Doctor17-git
6ec4171b20
Updated ru_RU.lang
updated russian localization
2021-07-18 21:56:34 +03:00
Bob
f98b0572b2 those floppy boys that avians have 2021-07-17 18:48:55 +02:00
Bob
b1382eaac2 more anvil work, RBMK irradiation channel IO 2021-07-15 23:22:20 +02:00
Bob
a2049e5e7b reinforced niter, anvil GUI, block of semtex 2021-07-14 22:47:50 +02:00
Bob
c64f1a74be SILEX access ports, coltan pain, better designators 2021-07-13 13:11:29 +02:00
Bob
8ee8d35126 coltan, it's coltan 2021-07-07 00:10:50 +02:00
HbmMods
913bcbd094
Merge pull request #227 from Doctor17-git/master
Updated ru_RU.lang
2021-07-04 21:01:28 +02:00
Doctor17-git
acfdfe8348
Updated ru_RU.lang 2021-07-04 21:59:48 +03:00
Bob
282c026657 fritz 2021-07-04 20:47:00 +02:00
Bob
11e113df5d fixed all the function mess 2021-06-28 19:22:29 +02:00
Doctor17-git
78b0b4b6a0
Updated ru_RU.lang 2021-06-27 21:48:15 +03:00
HbmMods
8a6c9450db
Merge pull request #213 from Doctor17-git/master
Updated ru_RU.lang
2021-06-27 20:40:41 +02:00
Doctor17-git
ebb318bd06
Updated ru_RU.lang
updated russian localization
2021-06-27 21:39:39 +03:00
Bob
e0c8e5fc52 more americium stuff, recipes, patching up anvil recipes 2021-06-27 20:28:14 +02:00
Doctor17-git
3bedd8d4c7
Updated ru_RU.lang 2021-06-26 21:03:51 +03:00
Bob
4b0ea024f6 nDRY0CmcYNU 2021-06-26 18:34:41 +02:00
Bob
01f8d02e8a demon core rotation, shackles, more digamma stuff, bismuth anvil 2021-06-25 00:05:39 +02:00
Bob
c664293781 black hole sun, won't you come 2021-06-22 23:14:23 +02:00
Bob
c4ecb20cf8 cargo pad tower goes boom 2021-06-21 23:03:26 +02:00
Bob
f9762916fd some more meltdown stuff 2021-06-21 22:45:26 +02:00
Bob
e81b466b26 swirlier black hole, some anvil work 2021-06-20 21:54:04 +02:00
Bob
edd359d3b2 anvils, americium 2021-06-20 02:30:14 +02:00
Boblet
8b0e5b4ef2 different RBMK reactivity functions per fuel type 2021-06-18 14:59:49 +02:00
Bob
6003279d27 even more RBMK fuels and elements and everything 2021-06-17 23:33:50 +02:00
Bob
bb0341bdee schm 2021-06-16 21:22:23 +02:00
Bob
a4f469fab6 microwave johnson 2021-06-15 23:59:23 +02:00
Bob
c6cc0fb735 maxwell the microwave turret 2021-06-14 23:42:50 +02:00
HbmMods
83b45a7b2f
Merge pull request #203 from Doctor17-git/master
Updated ru_RU.lang
2021-06-13 21:27:37 +02:00
Doctor17-git
928a03f6a0
Updated ru_RU.lang
updated russian localization
2021-06-13 22:19:25 +03:00
Bob
204f1e990a big chungus (turbine edition), screwables, AZ-5 funsies 2021-06-13 21:10:59 +02:00
Bob
f2e974e7d0 chungus 2021-06-10 22:45:16 +02:00
Bob
ddf03ca95d experimental mark 5 2021-06-09 22:56:40 +02:00
Boblet
955ce1c283 æügh 2021-06-08 13:13:59 +02:00
Boblet
1043a8a1af arrrgh 2021-06-08 13:00:53 +02:00
HbmMods
579b9c3bce
Merge pull request #198 from Doctor17-git/master
Updated ru_RU.lang
2021-06-06 20:13:18 +02:00
Doctor17-git
aff03d014b
Updated ru_RU.lang
updated russian
2021-06-06 20:52:15 +03:00
Bob
50768cc6e7 RBMK console fancy display, patched up the whole thing 2021-06-06 19:42:20 +02:00
Bob
4d72274a46 RBMK attachable lids, glass variation 2021-06-05 22:53:43 +02:00
Doctor17-git
47674e3078
Updated ru_RU.lang 2021-06-04 17:26:17 +03:00
Boblet
bb8a42e0b7 new energy API and power net 2021-06-04 15:21:33 +02:00
Boblet
6d211ee8db basic 3D radiation system, fixed radiation config not working 2021-06-04 11:49:00 +02:00
Bob
4c85dc2a55 improved black hole visuals, finished irradiation channel for RBMK 2021-06-03 18:34:51 +02:00
Bob
2b5d95ea01 RBMK outgasser column 2021-06-02 00:17:54 +02:00
Doctor17-git
d7135ebe0a
Updated ru_RU.lang 2021-05-31 00:19:44 +03:00
Bob
d23e442572 storage drum, RBMK waste reprocessing 2021-05-30 22:55:59 +02:00
Bob
5ed1a57e9f more assets, technetium 2021-05-30 00:55:25 +02:00
Bob
d4b32a8f7a radium coffee 2021-05-24 17:21:39 +02:00
Bob
594e7becb2 a 2021-05-23 23:08:17 +02:00
Doctor17-git
37a75ac029
Updated ru_RU.lang 2021-05-24 00:02:04 +03:00
HbmMods
f6e50d3d95
Merge pull request #191 from Doctor17-git/master
Updated ru_RU.lang
2021-05-23 23:01:13 +02:00
Doctor17-git
26ba2b6abe
Updated ru_RU.lang
updated russian localization
2021-05-23 23:58:23 +03:00
Bob
af89f10a27 it all 2021-05-23 22:37:13 +02:00
Doctor17-git
20deae4685
Updated ru_RU.lang 2021-05-22 17:49:37 +03:00
Bob
e0db26ef44 RBMK recycling pellets, colored concrete, more fireext mechanics 2021-05-21 01:01:50 +02:00
Bob
b7c5f89ba5 HEV battery block, radiation system cleanup and preparation, sssand 2021-05-19 23:25:33 +02:00
Boblet
ce04dd5265 some radiation handling stuff 2021-05-19 11:36:32 +02:00
Bob
f01d1bfbb5 fire extinguisher 2021-05-18 23:12:05 +02:00
Bob
8ac797a5ae superior localization 2021-05-16 20:07:41 +02:00
HbmMods
a62095a444
Merge pull request #188 from Doctor17-git/master
Updated ru_RU.lang
2021-05-16 17:31:14 +02:00
Doctor17-git
4cf4d057af
Updated ru_RU.lang
rbmk guide
rbmk guide
2021-05-16 17:31:18 +03:00
Bob
e7148fe317 cheese, RBMK guide book 2021-05-16 15:19:32 +02:00
Doctor17-git
a1de6f0a7f
Updated ru_RU.lang
aaa
2021-05-15 21:20:07 +03:00
Doctor17-git
60758cb914
Updated ru_RU.lang 2021-05-15 21:03:37 +03:00
Doctor17-git
09b6a41316
Updated ru_RU.lang
updated russian localization
2021-05-15 20:44:29 +03:00
Bob
df55b5e5f6 RBMK guidebook almost completed 2021-05-15 18:04:18 +02:00
HbmMods
dfc8749fbe
Merge pull request #187 from Doctor17-git/master
Updated ru_RU.lang
2021-05-13 17:36:53 +02:00
Doctor17-git
3c23a0010c
Updated ru_RU.lang
a?
2021-05-13 18:34:22 +03:00
HbmMods
d66a30cdf5
Merge pull request #186 from Doctor17-git/master
Updated ru_RU.lang
2021-05-13 17:22:04 +02:00
Bob
81cdd7a03a pipes, all of them 2021-05-13 17:21:31 +02:00
Doctor17-git
bef540e9ee
Updated ru_RU.lang 2021-05-13 15:24:40 +03:00
Doctor17-git
0924e23fd9
Updated ru_RU.lang
updated russian localization
2021-05-13 15:22:49 +03:00
Bob
8971cafa39 some small fixes, decorative pipes 2021-05-13 01:25:34 +02:00
Doctor17-git
34d74e8cac
Updated ru_RU.lang
updated russian localization
2021-05-10 13:06:35 +03:00
HbmMods
cfb524b351
Merge pull request #183 from Doctor17-git/master
Updated ru_RU.lang
2021-05-09 20:01:15 +02:00
Doctor17-git
8af4c5ab21
Updated ru_RU.lang 2021-05-09 19:57:01 +03:00
Doctor17-git
6d2a72db28
Updated ru_RU.lang
updated russian localization
2021-05-09 19:54:10 +03:00
Bob
9c63e9c3d2 RBMK console for the most part, recipes, tweaks, gamerules
i probably forgot something really vital but here goes nothing
2021-05-09 18:42:10 +02:00
Bob
4469d43e0b a tiny bit of RBMK console work 2021-05-06 23:48:30 +02:00
Bob
f89fc3702e RBMK auto control function limit, console GUI, recipes 2021-05-05 23:35:08 +02:00
Bob
1625ef2211 automatic RBMK control rod functions completed, control panel GUI tex 2021-05-04 23:58:04 +02:00
Bob
cf29733200 functional RBMK boiler 2021-05-03 23:06:09 +02:00
Bob
8cc1856a23 RBMK debris items, more gamerules, explosion effects, steel grates 2021-05-02 21:12:21 +02:00
Bob
f2f6df24b8 more RBMK gamerules, fixed RBMK fuels incorrect init, proper heat gen 2021-04-28 22:52:42 +02:00
Bob
4a5947cec5 RBMK heat movement, column-specific meltdowns, gamerules 2021-04-27 23:31:08 +02:00
Bob
1554109061 RBMK debris, lots of it 2021-04-26 23:15:48 +02:00
HbmMods
1ab407142c
Merge pull request #176 from Doctor17-git/master
Updated ru_RU.lang
2021-04-25 21:30:49 +02:00
Doctor17-git
8e09bd7362
Updated ru_RU.lang
h
2021-04-25 22:23:33 +03:00
Doctor17-git
15eb4cc236
Updated ru_RU.lang
updated russian localization
2021-04-25 22:21:14 +03:00
Bob
590ea605a4 depth ores, clusters 2021-04-25 20:58:03 +02:00
Bob
23fb11a3e4 finished RBMK auto control GUI, basic functionality, block spiders 2021-04-21 22:56:36 +02:00
Bob
6235e886de automatic RBMK control rod GUI base 2021-04-20 22:13:19 +02:00
Bob
c0887a5d32 marshmallows, neptunium fuel, better RBMK fires 2021-04-19 22:44:36 +02:00
Bob
693756653e more RBMK gui work, meltdown mechanics, debris blocks 2021-04-18 23:44:34 +02:00
Bob
82ca248049 functional RBMK rods, boiler GUI work 2021-04-17 16:58:31 +02:00
Bob
4c9893715c RBMK console texture 2021-04-13 22:19:02 +02:00
Bob
573b1a6af7 more RBMK byproducts, base block for the console 2021-04-12 23:30:00 +02:00
Boblet
7ea4c857de some localizations, RBMK control rods GUI base 2021-04-12 12:50:51 +02:00
Bob
d8f58fd19e RBMK fuels, funny smelling isotopes 2021-04-11 21:15:21 +02:00
Doctor17-git
de78e292c3
Updated ru_RU.lang
updated russian localization
2021-04-11 16:28:41 +03:00
Bob
b7fcdee709 RBMK chain reaction 2021-04-11 15:17:51 +02:00
Bob
f572329046 RBMK boilers and debugging overlays 2021-04-10 18:42:02 +02:00
Doctor17-git
b1cf40f4ba
Updated ru_RU.lang
updated russian localization
2021-04-10 00:11:14 +03:00
Boblet
07db4456af replaced biome specific world gen, RBMK boiler 2021-04-09 13:04:08 +02:00
Bob
e0a5d3f1d0 RBMK flux and ladders, many ladders 2021-04-09 00:28:56 +02:00
Boblet
84f16755e6 RBMK: make that heat, move that heat 2021-04-07 13:02:30 +02:00
Bob
bd9a4cbf8e rbmk 3: return of the neutron sources 2021-04-06 22:43:21 +02:00
Bob
5f4e3e2d28 RBMK fuel because the RBMK needs fuel 2021-04-05 17:18:49 +02:00
Bob
d1cc4ce941 some textures 4 you & me 2021-04-04 20:52:33 +02:00
HbmMods
f53f9b0164
Merge pull request #162 from Doctor17-git/master
Updated ru_RU.lang
2021-04-03 20:10:01 +02:00
Bob
043f024220 rbmk yeah 2021-04-03 20:09:30 +02:00
Doctor17-git
3da4a34141
Updated ru_RU.lang
updated russian localization
2021-04-02 11:17:19 +03:00
Doctor17-git
304b068b1c
Updated ru_RU.lang
updated russian localization
2021-04-01 22:53:49 +03:00
Bob
6d90b5b47f general code cleanup 2021-04-01 21:40:00 +02:00
Boblet
0dc919c512 catalytic gas mask 2021-03-30 13:00:55 +02:00
Bob
1851651b10 merged remote with the zirconium fix locally 2021-03-29 23:39:25 +02:00
Boblet
0556bf3e31 slightly improved contamination code 2021-03-29 13:02:22 +02:00
HbmMods
fe0ccbbe67
Merge pull request #160 from Doctor17-git/master
Updated ru_RU.lang
2021-03-28 21:15:26 +02:00
Doctor17-git
4dc1944995
Updated ru_RU.lang
updated russian localization
2021-03-28 22:12:50 +03:00
Bob
9f3ebe8593 do you like how i dance, i got zirconium pants 2021-03-28 20:34:17 +02:00
Doctor17-git
45813d0b12
Updated ru_RU.lang
updated russian localization
2021-03-28 14:52:18 +03:00
Bob
fe3a1adfea NEI SILEX handler, rebalanced hazmats, liquidator suit, more block rads 2021-03-28 02:35:25 +01:00
Boblet
3d989eaa8b display effects for hazard blocks 2021-03-26 14:04:40 +01:00
Boblet
9a611c9c8f eksploshion 2021-03-26 13:02:54 +01:00
Bob
4a3b6e6026 custom missile turbines, more ItemHazard improvements, updated to JDK1.8 2021-03-25 22:49:04 +01:00
Boblet
c44cb67656 hazardous block items, funny centralized hazard system for items 2021-03-25 12:53:43 +01:00
Bob
03e80f5a12 some FEL stuff, spicy gold pellets, more zirconium 2021-03-24 23:45:31 +01:00
Bob
fb63ad0736 some more textures, digamma diagnostic, RBMK fuel 2021-03-24 00:33:29 +01:00
Bob
7f5c39322a Merge remote-tracking branch 'origin/master' 2021-03-22 23:12:29 +01:00
Bob
0ceb72d978 more FEL, small fixes 2021-03-22 23:12:23 +01:00
HbmMods
98c2776a43
Merge pull request #155 from Doctor17-git/master
Updated ru_RU.lang
2021-03-21 22:08:59 +01:00
Doctor17-git
1e9ad31212
Updated ru_RU.lang
updated russian localization
2021-03-21 23:52:36 +03:00
Bob
3ae4c3757a the full CIWS experience 2021-03-21 21:42:52 +01:00
Bob
243c6a9cd6 more SILEX work, new ciws textures 2021-03-21 00:36:27 +01:00
Bob
eeeb208879 test for somewhat dynamic guide books 2021-03-16 23:57:40 +01:00
HbmMods
031414d175
Merge pull request #149 from Doctor17-git/master
Updated ru_RU.lang
2021-03-14 21:29:23 +01:00
Doctor17-git
bf7f123e63
Updated ru_RU.lang
updated russian localization
2021-03-14 23:28:38 +03:00
Bob
ed34a5b26a hadron overhaul, slight fixes, recipe adjustments 2021-03-14 21:09:23 +01:00
Bob
ec3fe28feb moved assets to resources directory 2021-03-14 21:08:18 +01:00
Bob
4f94b0f5c2 rocket launcher turret, SILEX GUI overhaul, lasers 2021-03-12 23:39:47 +01:00
Bob
9edd588a23 a bit of silex 2021-03-10 22:34:30 +01:00
Bob
e9696bcef3 UV for SILEX model, rebalanced item radiation values 2021-03-09 23:51:35 +01:00
HbmMods
ef23405f09
Merge pull request #145 from Doctor17-git/master
updated ru_RU.lang
2021-03-08 20:48:34 +01:00
Doctor17-git
6a46e2c766
updated ru_RU.lang
updated russian localization
2021-03-08 22:47:12 +03:00
Bob
7721634217 why 2021-03-08 20:30:15 +01:00
HbmMods
ed586502b0
Merge pull request #144 from Doctor17-git/master
Updated ru_RU.lang
2021-03-07 17:16:57 +01:00
Doctor17-git
cffc924c78
Updated ru_RU.lang
updated russian localization
2021-03-07 19:14:07 +03:00
Bob
773fcb9430 all of it 2021-03-07 16:29:28 +01:00
Bob
b37852ae07 finished the first turret, full AI chip functionality 2021-03-04 22:00:22 +01:00
Bob
adcc7e4bd6 partial AI chip implementation, nuclear waste placeholders 2021-03-03 22:36:42 +01:00
Bob
bc89c4a1e1 base turret completed (minus player whitelist) 2021-03-02 23:34:51 +01:00
Bob
e2585760de slight tweaks, DNT armor, digamma protection, mesothelioma 2021-03-01 23:14:29 +01:00
Bob
ebdc0e9ca2 turret prototype GUI 2021-02-28 22:31:46 +01:00
Bob
21943e186c all that turret targeting code 2021-02-27 23:02:14 +01:00
Bob
61c5d932b0 screm 2021-02-25 00:24:22 +01:00
Bob
e9bd39693a removed TE renderer for mirrors, new turret models 2021-02-21 23:07:47 +01:00
HbmMods
9415164fa7
Merge pull request #142 from Doctor17-git/master
Updated ru_RU.lang
2021-02-15 21:47:13 +01:00
Doctor17-git
2eeb887592
Updated ru_RU.lang
updated russian localization
2021-02-15 23:46:07 +03:00
Bob
63973c78b1 tungsten crate, more recycling recipes, fixes 2021-02-15 21:41:54 +01:00
Bob
c40f412270 5htp 2021-02-12 22:33:32 +01:00
Bob
04861b1b0a speedran making a fully functional crucible 2021-02-12 00:35:00 +01:00
HbmMods
68af222c19
Merge pull request #140 from Doctor17-git/master
Updated ru_RU.lang
2021-02-10 23:10:51 +01:00
Bob
5f3a641d73 form fixes, derrick gas funnies, new radar model, more booze 2021-02-10 23:10:10 +01:00
Doctor17-git
f71a065323
Updated ru_RU.lang
updated russian localization
2021-02-08 12:32:52 +03:00
Bob
78808b1f5d those writings on the wall 2021-02-07 23:26:58 +01:00
Doctor17-git
a68f9173a0
Updated ru_RU.lang
updated russian localization
2021-02-07 10:18:17 +03:00
Bob
0490a82c19 finished up most gasses, ancient scraps, digamma achievements 2021-02-06 23:50:50 +01:00
Bob
43329d890d more billet stuff, changed recipes, fixed radiation 2021-02-05 00:30:33 +01:00
Doctor17-git
c7251aa980
Updated ru_RU.lang
updated russian localization
2021-02-04 15:05:05 +03:00
Bob
f8a7b3f393 billets and tritium lamps 2021-02-03 23:45:07 +01:00
Bob
21232efa21 mesothelioma mesothelioma mesothelioma mesothelioma mesothelioma 2021-02-01 22:48:50 +01:00
HbmMods
7b432824d2
Merge pull request #139 from Doctor17-git/master
Updated ru_RU.lang
2021-01-31 21:29:00 +01:00
Doctor17-git
8059bce3ed
Updated ru_RU.lang
updated russian localization
2021-01-31 23:27:19 +03:00
Bob
0bbf99b47f finishing up the armor mods, some new radiation funnies 2021-01-31 21:18:24 +01:00
Bob
24a787c4bb alas, even more trash 2021-01-31 02:03:14 +01:00
Bob
565133eefb mods and attribute modifiers for armors 2021-01-28 23:46:46 +01:00
Doctor17-git
36d29c44a3
Updated ru_RU.lang
updated russian localization
2021-01-27 17:19:45 +03:00
Doctor17-git
832ea215e0
Updated ru_RU.lang
updated russian localization

bj and glory
2021-01-27 15:46:17 +03:00
Bob
956a7bb106 more armor mods! 2021-01-26 23:47:52 +01:00
Bob
470217d939 peas, beans, orbs 2021-01-25 21:30:07 +01:00
HbmMods
2c472b430a
Merge pull request #137 from Doctor17-git/master
Updated ru_RU.lang
2021-01-24 20:14:03 +01:00
Doctor17-git
026e822992
Updated ru_RU.lang
updated russian localization
2021-01-24 22:09:59 +03:00
Bob
11d0946616 all the parts 2021-01-24 19:52:54 +01:00
Bob
c5e7a47547 finished the armor table, added blank armor mods 2021-01-23 19:47:55 +01:00
Bob
39a77a67d8 more armor mod stuff 2021-01-22 22:54:16 +01:00
Bob
14ac7e644e eh 2021-01-21 22:59:12 +01:00
Bob
d75c6dee13 scream for cream 2021-01-20 22:28:47 +01:00
Bob
32df415e58 cha cha real smooth 2021-01-18 23:34:32 +01:00
Bob
3fc90bca44 some conveyor belt improvements, reworked orbital death ray 2021-01-17 22:09:22 +01:00
Bob
96065ca523 digamma armor model and UV, quackos NEI fix 2021-01-16 19:09:09 +01:00
Bob
ee3b483ac3 digamma UV, some more assets for later 2021-01-15 22:22:34 +01:00
Bob
8e582f70ed boppin' 2021-01-14 23:49:11 +01:00
Bob
6972a6825e xanax, it's xanax 2021-01-11 22:50:37 +01:00
HbmMods
b49e2ded8e
Merge pull request #135 from Doctor17-git/master
Updated ru_RU.lang
2021-01-10 18:10:58 +01:00
Doctor17-git
bfa447717e
Updated ru_RU.lang
updated russian localization
2021-01-10 20:09:06 +03:00
HbmMods
e414887a56
Merge pull request #134 from Doctor17-git/master
Updated ru_RU.lang
2021-01-10 18:04:26 +01:00
Bob
692deefdec slapped new explosion particles onto every small explosion 2021-01-10 18:03:42 +01:00
Doctor17-git
4d23d5a4bc
Updated ru_RU.lang
updated russian localization
2021-01-09 20:52:44 +03:00
Bob
b41fca36ff more mini nukes, mirvs and all that jazz 2021-01-09 17:31:22 +01:00
Doctor17-git
41c47abfe5
Updated ru_RU.lang
updated russian localization
2021-01-08 11:14:41 +03:00
Bob
3a7d16e8af bop 2021-01-07 22:51:06 +01:00
Bob
23e6e2f8e5 when the big pizza pie hits the moon like your eye that's amoreeee 2021-01-06 00:32:44 +01:00
Bob
4462a48648 made jetpacks less garbage, new explosion FX test 2021-01-04 22:14:19 +01:00
Bob
af7e888376 waatz me like there's no tomorrow 2021-01-03 18:21:10 +01:00
HbmMods
db97f4ad2b
Merge pull request #132 from Doctor17-git/master
Updated ru_RU.lang
2021-01-01 12:14:48 +01:00
Doctor17-git
d26d5b4433
Updated ru_RU.lang
updated russian localization
happy new year to all!
2020-12-31 22:58:13 +03:00
Bob
bdd97dfe9c oh come on 2020-12-31 20:22:37 +01:00
Bob
7784754c5f achievements, jungle dungeons, cleanup 2020-12-31 20:18:01 +01:00
Bob
759108ba32 polished BOT, some uninteresting cleanup crap 2020-12-31 03:14:14 +01:00
HbmMods
934c14fb80
Merge pull request #131 from Doctor17-git/master
Updated ru_RU.lang
2020-12-28 19:31:55 +01:00
Bob
1a31a5b7c5 flop exclusive 2020-12-28 19:30:50 +01:00
Doctor17-git
6117290a86
Updated ru_RU.lang
updated russian localization
2020-12-27 19:52:50 +03:00
HbmMods
3289f78cc6
Merge pull request #130 from Doctor17-git/master
Updated ru_RU.lang
2020-12-27 17:43:44 +01:00
Bob
c2eac4f3e4 biscuits 2020-12-27 17:43:12 +01:00
Doctor17-git
268410e245
Updated ru_RU.lang
updated russian localization
2020-12-27 00:14:49 +03:00
Doctor17-git
f84e59e516
Updated ru_RU.lang
updated russian localization
2020-12-26 23:57:25 +03:00
Doctor17-git
2067855093
Updated ru_RU.lang
updated russian localization
2020-12-26 23:55:11 +03:00
Bob
7159f83d2d lots of things 2020-12-26 21:03:00 +01:00
Doctor17-git
a125ea3478
Updated ru_RU.lang
updated russian localization
2020-12-26 15:07:08 +03:00
HbmMods
93e0e67446
Merge pull request #128 from Doctor17-git/master
Updated ru_RU.lang
2020-12-25 18:39:04 +01:00
Bob
cddc0d3154 radiation elemental 2020-12-25 18:38:23 +01:00
Doctor17-git
7c3536c5ba
Updated ru_RU.lang
updated russian localization
2020-12-25 13:37:00 +03:00
Doctor17-git
fff760716b
Updated ru_RU.lang
updated russian localization
merry christmas!
2020-12-25 11:41:22 +03:00
Bob
06c34f4f0f more armor work, lang keys 2020-12-25 01:38:31 +01:00
Bob
2b11753e76 🅱️ower armor 2020-12-24 00:11:03 +01:00
Bob
25850278df oof, once more with feeling 2020-12-22 23:09:08 +01:00
HbmMods
51ece6be89
Merge pull request #126 from Doctor17-git/master
Updated ru_RU.lang
2020-12-22 22:36:54 +01:00
Bob
15717d30cb staatliches amt für ermittlung, öffnen auf! 2020-12-22 22:36:35 +01:00
Doctor17-git
27a17f793e
Updated ru_RU.lang
updated russian localization
2020-12-21 23:35:44 +03:00
Doctor17-git
44d175f406
Updated ru_RU.lang
updated russian localization
2020-12-21 23:31:47 +03:00
Bob
d08b3fa98d n 2020-12-21 21:05:19 +01:00
Bob
8a69381ec0 HEV suit, RAD beast 2020-12-20 00:14:56 +01:00
HbmMods
2e55a38e77
Merge pull request #122 from Doctor17-git/master
Updated ru_RU.lang
2020-12-15 23:36:14 +01:00
Doctor17-git
86fe478de0
Updated ru_RU.lang
updated russian localization
2020-12-16 01:09:17 +03:00
Doctor17-git
9a5d1654bf
Updated ru_RU.lang
updated russian localization
2020-12-16 01:06:41 +03:00
Bob
aee7709b93 experimental new converter functionality, more bolter stuff 2020-12-15 22:29:46 +01:00
Doctor17-git
74018767ac
Updated ru_RU.lang
updated russian localization
2020-12-15 11:16:14 +03:00
Bob
149a6231f5 it's the bolter 2020-12-14 23:53:19 +01:00
Bob
c8aaef9873 solar towers yeah 2020-12-11 23:35:13 +01:00
Bob
03841c4043 for real now 2020-12-06 21:40:21 +01:00
Bob
444191304d added RTG pellet fact generator 2020-12-06 20:28:28 +01:00
HbmMods
22f01754e6
Merge pull request #119 from Doctor17-git/master
Updated ru_RU.lang
2020-12-06 20:00:45 +01:00
Doctor17-git
82d494dffa
Updated ru_RU.lang
updated russian localization
2020-12-06 21:19:33 +03:00
Bob
bb51c07c05 even more lang stuff, finished hadron 2020-12-06 18:42:36 +01:00
Doctor17-git
1391dba33f
Updated ru_RU.lang
updated russian localization
2020-12-06 09:30:47 +03:00
Bob
2526d8e100 hadron recipes, hopper IO, NEI 2020-12-06 01:37:35 +01:00
Bob
ba08905bc1 more hadron work, some UV and texturing, more nether stuff 2020-12-05 00:24:57 +01:00
Doctor17-git
65703d6890
Updated ru_RU.lang
updated russian localization
2020-12-04 10:09:36 +03:00
Bob
db47a1328a hadron recipes, nether funnies, geiger counter localization options 2020-12-04 00:05:44 +01:00
Doctor17-git
1f24d92449
Updated ru_RU.lang
updated russian localization
2020-12-03 15:59:19 +03:00
Doctor17-git
51dbdd6845
Updated ru_RU.lang
updated russian localization
2020-12-03 15:39:34 +03:00
Doctor17-git
7ef19ad3e8
Updated ru_RU.lang
finally
.lang keys for items descriptions
2020-12-03 12:00:41 +03:00
Bob
4f8293ae0c first tests for misc lang keys, more funny particles, extended hadron 2020-12-02 22:33:57 +01:00
Bob
6d5577573a senf 2020-11-30 23:06:33 +01:00
HbmMods
5844305689
Merge pull request #115 from Doctor17-git/master
Updated ru_RU.lang
2020-11-29 18:16:18 +01:00
Doctor17-git
b6cd28e3f5
Updated ru_RU.lang
collider go b o o m
2020-11-29 20:13:52 +03:00
HbmMods
53f272f1d1
Merge pull request #114 from Doctor17-git/master
Updated ru_RU.lang
2020-11-29 17:58:44 +01:00
Bob
e4c453b4c1 the better part of the hadron, mister FBI himself 2020-11-29 17:58:10 +01:00
Bob
ea7fc0f9bd more hadron work 2020-11-27 23:27:34 +01:00
Doctor17-git
985c95ec7f
Updated ru_RU.lang
updated russian localization
2020-11-27 22:33:27 +03:00
Bob
6ca0b4d2b5 memepack release 2020-11-27 20:13:59 +01:00
Bob
8d481b21a0 fixed beta food, some crunchy stuff 2020-11-24 23:59:10 +01:00
Bob
4e0622ff9c will you calm down 2020-11-23 19:49:43 +01:00
HbmMods
e7f8fc91ed
Merge pull request #111 from Doctor17-git/master
Updated ru_RU.lang
2020-11-22 16:48:32 +01:00
Doctor17-git
548f58da61
Updated ru_RU.lang
finally
the commit
2020-11-22 18:41:02 +03:00
Bob
efc7865c0c i scream 2020-11-22 16:18:10 +01:00
Bob
52de90017a bottlecap blocks, egon backpack texture, aschrab cell model 2020-11-09 21:07:50 +01:00
HbmMods
87e669ad36
Merge pull request #110 from Doctor17-git/master
Updated ru_RU.lang
2020-10-30 23:04:10 +01:00
Bob
56698989ed even morer igen work 2020-10-30 23:03:43 +01:00
Doctor17-git
ab7f93c5d4
Updated ru_RU.lang
mmm pancakes with gem dust
2020-10-26 09:09:54 +03:00
13032 changed files with 1473233 additions and 360695 deletions

16
.editorconfig Normal file
View File

@ -0,0 +1,16 @@
root = true
[*]
charset = utf-8
end_of_line = crlf
indent_style = tab
indent_size = tab
insert_final_newline = true
trim_trailing_whitespace = true
max_line_length = off
[{*.info,*.json,*.mcmeta,*.md,*.cfg,*.yml,*.toml}]
tab_width = 2
[{*.info,*.mcmeta,*.cfg}]
end_of_line = lf

View File

@ -0,0 +1,12 @@
---
name: Issue template (mandatory)
about: Template for mod-related issues
title: ''
labels: ''
assignees: ''
---
### Describe the bug
Please describe the issue in as much detail as possible. Also mention the version of the mod you're running, if it's not the newest. In the case of a crash, please attach a crash log.

62
.github/workflows/build.yml vendored Normal file
View File

@ -0,0 +1,62 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.
# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
# Yes this is a mostly untouched Github actions template
name: Java CI with Gradle
on:
schedule:
- cron: "0 0 * * *"
workflow_dispatch:
jobs:
build:
runs-on: ubuntu-latest
permissions:
contents: read
steps:
- uses: actions/checkout@v4
- name: Set up JDK 8
uses: actions/setup-java@v4
with:
java-version: '8'
distribution: 'temurin' # Temurin because it's default :P
# Calculate days since 10/10/10
- name: Calculate days since 10/10/10
id: calculate_days
run: |
start_date="2010-10-10"
current_date=$(date +%Y-%m-%d)
days_since=$(( ($(date -d "$current_date" +%s) - $(date -d "$start_date" +%s)) / 86400 ))
echo "days=$days_since" >> $GITHUB_OUTPUT
# Update version files with proper sed syntax
- name: Update version files
run: |
days=${{ steps.calculate_days.outputs.days }}
# Use proper sed syntax for Linux runners
sed -i "s/public static final String VERSION = \".*\";/public static final String VERSION = \"1.0.27 BETA ($days)\";/" src/main/java/com/hbm/lib/RefStrings.java
sed -i "s/mod_build_number=.*/mod_build_number=$days/" gradle.properties
# Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
# See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
- name: Setup Gradle
uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
- name: Build with Gradle Wrapper
run: ./gradlew build
- name: Upload a Build Artifact
uses: actions/upload-artifact@v4.6.0
with:
# A file, directory or wildcard pattern that describes what to upload
path: ./build/libs

36
.gitignore vendored
View File

@ -1,11 +1,31 @@
/.gradle/
/bin/
/build/
/eclipse/
/lib/
/.git/
/.gradle/
/.settings/
# eclipse
/eclipse
/bin
/*.launch
/.settings
/.metadata
/.classpath
/.project
# idea
/out
/*.ipr
/*.iws
/*.iml
/.idea
# gradle
/build
/.gradle
# vscode
/.vscode
# other
/run
# CurseForge configuration
/curseforge.properties
# Changelog backup
/changelog.bak

43
CONTRIBUTING.md Normal file
View File

@ -0,0 +1,43 @@
# NTM Contribution Guidelines, Version 1
## Keep it concise
The best PRs are the ones that are small and to the point. The entire PR should focus on the thing you're trying to do, whether it's a fix or a feature PR. If your PR adds the Super Weldtronic 9000, there's no reason to include changes and tweaks to other things that have nothing to do with the Super Weldtronic 9000. If you think those changes are still necessary, open a new PR.
## Keep it clean
While admittedly my own code isn't the cleanest on earth, please try to keep terrible practices at a minimum. Also avoid things like unused variables and imports, mixed indentation styles or changes that have a high likelihood of breaking things.
Things you should also avoid include:
* new libraries (unless your PR absolutely needs it like for special mod compat)
* duplicate util functions (just use what we have, man)
* unused or half finished util functions (for obvious reasons)
* half finished or obviously broken features (à la "bob will fix it, i'm sure of it", please don't do that)
* updating the changelog (you're guaranteed to cause a merge conflict with that)
* any use of `I18n`, use `I18nUtil` instead
## Test your code
This should go without saying, but please don't PR code that was never actually tested or has obvious compiler errors in it.
**Addendum:** Because apparently some people think that testing is somehow optional, it is now **mandatory** to test the code both on a client and on a server. If the PR contains compat code, the game has to work **with and without** the mod that the compat is for.
## No refactor PRs
Your refactors suck ass and usually something ends up breaking.
## Communication
If you're planning on adding some new thing or doing a grand change, it's best to ask whether that's a good idea before spending 50 hours on a project that won't end up getting merged, due to issues that could have been entirely avoidable with communication.
## No guarantees
This ties together with the previous point - there's no guarantees that your PR gets merged no matter how hard or long you've worked on it. However, if you follow these guidelines, there's a good chance that your PR will be accepted.
## I want to help but don't know where to start
If you want to help the project, consider getting involved with the [wiki](https://nucleartech.wiki/) first. Writing an article is the easiest and quickest way of helping, and requires no programming knowledge. If you do know Java and want to help, consider these places first:
* Localization, i.e. translations in different language are always accepted.
* `IConfigurableMachine`, an interface that allows machines to be added to the `hbmMachines.json` config, is still not used by many machines.
* F1 Presentations, also known as "Stare" or "Jar Presentations", is a neat system of creating a short movie explaining functionality. All the relevant code can be found in `com.hbm.wiaj`.
* Adding tooltips to more machines, explaining some of the basics.

165
LICENSE.LESSER Normal file
View File

@ -0,0 +1,165 @@
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
This version of the GNU Lesser General Public License incorporates
the terms and conditions of version 3 of the GNU General Public
License, supplemented by the additional permissions listed below.
0. Additional Definitions.
As used herein, "this License" refers to version 3 of the GNU Lesser
General Public License, and the "GNU GPL" refers to version 3 of the GNU
General Public License.
"The Library" refers to a covered work governed by this License,
other than an Application or a Combined Work as defined below.
An "Application" is any work that makes use of an interface provided
by the Library, but which is not otherwise based on the Library.
Defining a subclass of a class defined by the Library is deemed a mode
of using an interface provided by the Library.
A "Combined Work" is a work produced by combining or linking an
Application with the Library. The particular version of the Library
with which the Combined Work was made is also called the "Linked
Version".
The "Minimal Corresponding Source" for a Combined Work means the
Corresponding Source for the Combined Work, excluding any source code
for portions of the Combined Work that, considered in isolation, are
based on the Application, and not on the Linked Version.
The "Corresponding Application Code" for a Combined Work means the
object code and/or source code for the Application, including any data
and utility programs needed for reproducing the Combined Work from the
Application, but excluding the System Libraries of the Combined Work.
1. Exception to Section 3 of the GNU GPL.
You may convey a covered work under sections 3 and 4 of this License
without being bound by section 3 of the GNU GPL.
2. Conveying Modified Versions.
If you modify a copy of the Library, and, in your modifications, a
facility refers to a function or data to be supplied by an Application
that uses the facility (other than as an argument passed when the
facility is invoked), then you may convey a copy of the modified
version:
a) under this License, provided that you make a good faith effort to
ensure that, in the event an Application does not supply the
function or data, the facility still operates, and performs
whatever part of its purpose remains meaningful, or
b) under the GNU GPL, with none of the additional permissions of
this License applicable to that copy.
3. Object Code Incorporating Material from Library Header Files.
The object code form of an Application may incorporate material from
a header file that is part of the Library. You may convey such object
code under terms of your choice, provided that, if the incorporated
material is not limited to numerical parameters, data structure
layouts and accessors, or small macros, inline functions and templates
(ten or fewer lines in length), you do both of the following:
a) Give prominent notice with each copy of the object code that the
Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the object code with a copy of the GNU GPL and this license
document.
4. Combined Works.
You may convey a Combined Work under terms of your choice that,
taken together, effectively do not restrict modification of the
portions of the Library contained in the Combined Work and reverse
engineering for debugging such modifications, if you also do each of
the following:
a) Give prominent notice with each copy of the Combined Work that
the Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the Combined Work with a copy of the GNU GPL and this license
document.
c) For a Combined Work that displays copyright notices during
execution, include the copyright notice for the Library among
these notices, as well as a reference directing the user to the
copies of the GNU GPL and this license document.
d) Do one of the following:
0) Convey the Minimal Corresponding Source under the terms of this
License, and the Corresponding Application Code in a form
suitable for, and under terms that permit, the user to
recombine or relink the Application with a modified version of
the Linked Version to produce a modified Combined Work, in the
manner specified by section 6 of the GNU GPL for conveying
Corresponding Source.
1) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (a) uses at run time
a copy of the Library already present on the user's computer
system, and (b) will operate properly with a modified version
of the Library that is interface-compatible with the Linked
Version.
e) Provide Installation Information, but only if you would otherwise
be required to provide such information under section 6 of the
GNU GPL, and only to the extent that such information is
necessary to install and execute a modified version of the
Combined Work produced by recombining or relinking the
Application with a modified version of the Linked Version. (If
you use option 4d0, the Installation Information must accompany
the Minimal Corresponding Source and Corresponding Application
Code. If you use option 4d1, you must provide the Installation
Information in the manner specified by section 6 of the GNU GPL
for conveying Corresponding Source.)
5. Combined Libraries.
You may place library facilities that are a work based on the
Library side by side in a single library together with other library
facilities that are not Applications and are not covered by this
License, and convey such a combined library under terms of your
choice, if you do both of the following:
a) Accompany the combined library with a copy of the same work based
on the Library, uncombined with any other library facilities,
conveyed under the terms of this License.
b) Give prominent notice with the combined library that part of it
is a work based on the Library, and explaining where to find the
accompanying uncombined form of the same work.
6. Revised Versions of the GNU Lesser General Public License.
The Free Software Foundation may publish revised and/or new versions
of the GNU Lesser General Public License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the
Library as you received it specifies that a certain numbered version
of the GNU Lesser General Public License "or any later version"
applies to it, you have the option of following the terms and
conditions either of that published version or of any later version
published by the Free Software Foundation. If the Library as you
received it does not specify a version number of the GNU Lesser
General Public License, you may choose any version of the GNU Lesser
General Public License ever published by the Free Software Foundation.
If the Library as you received it specifies that a proxy can decide
whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the
Library.

162
README.md
View File

@ -1,42 +1,144 @@
# Hbm-s-Nuclear-Tech-GIT
# HBM's Nuclear Tech Mod for Minecraft 1.7.10
https://minecraft.curseforge.com/projects/hbms-nuclear-tech-mod?gameCategorySlug=mc-mods&projectID=235439
[NTM on Modrinth](https://modrinth.com/mod/ntm)
For a 1.12 fork, check this link: https://github.com/Drillgon200/Hbm-s-Nuclear-Tech-GIT/releases
[NTM on CurseForge](https://www.curseforge.com/minecraft/mc-mods/hbms-nuclear-tech-mod)
## Installation Instructions
[Official NTM Wiki](https://nucleartech.wiki/wiki/Main_Page)
[Bobcat's Blog (the blag)](https://hbmmods.github.io/), you can find lengthy yapping, upcoming features and some secrets here.
**This is for 1.7.10!** For 1.12, check out these projects:
* NTM Community Edition (WarFactory): https://github.com/MisterNorwood/Hbm-s-Nuclear-Tech-CE
* NTM Extended Edition (Alcater): https://github.com/Alcatergit/Hbm-s-Nuclear-Tech-GIT/releases
* NTM Reloaded: https://github.com/TheOriginalGolem/Hbm-s-Nuclear-Tech-GIT/releases
For 1.18, try Martin's remake: https://codeberg.org/MartinTheDragon/Nuclear-Tech-Mod-Remake/releases
## Downloading pre-compiled versions from GitHub
Simply navigate to "Releases" on the right side of the page, download links for the compiled JAR as well as the corresponding source code are under the "Assets" category below the changelog. Make sure to review all changelogs when updating!
## Building from source
Tired of waiting until the next version comes out? Here is a tutorial on how to compile the very newest version yourself:
1. Download minecraft forge 1.7.10 src
2. Unpack it somewhere
3. Download the source and insert it into the same folder. This will overwrite a couple of files, for example build.gradle
4. Run `gradlew setupDecompWorkspace` on windows or `./gradlew setupDecompWorkspace` on linux (remember: do not take the name of root in vain). Running this command on a blank forge workspace will yield errors, so it's important you insert the mod's source in step 3. The source has corrected versions of guild.gradle and the gradle wrapper, if done correctly it should run just fine.
5. The `build.gradle` file will reference these following files:
Please note that these installation instructions are assuming you're running Microsoft Windows operating system. Linux users should know what to do by looking at the same guide.
1. Make sure you have JDK8 installed. If not, download it from [adoptium.net](https://adoptium.net/temurin/releases?version=8)
2. If you don't have git installed, download&install it from [here](https://git-scm.com/downloads).
3. Open up "Git Bash":
* Press Windows Button, type "Git Bash" and press ENTER
4. Enter the directory where you would like the sources to be (advanced users can use any directory)
```bash
cd $HOME/Downloads
```
5. Download the source code:
```bash
git clone https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
```
4. Enter the source code directory
```bash
cd Hbm-s-Nuclear-Tech-GIT
```
5. Build the mod
```bash
./gradlew build
```
6. Locate the mod file.
1. Open up your file explorer.
2. Navigate to the location where you downloaded the sources.
* If you exactly followed step 1, it should be `C:/Users/%USER%/Downloads`.
3. Enter the downloaded source tree.
4. Navigate to `build/libs`.
5. Grab the "HBM-NTM-<version>.jar" one.
* This is your mod file. You can install it like any other mod by putting it into your mods directory.
## Contributing
If you want to make some changes to the mod, follow this guide:
1. Follow steps 1-2 from *Building from source* section
2. Create a directory where the repository will reside, using a name that is not "Hbm-s-Nuclear-Tech-GIT"
3. Download the forge src from [here](https://files.minecraftforge.net/net/minecraftforge/forge/index_1.7.10.html) and extract it into the directory.
4. Download the source code:
* Using Git Bash, enter wherever your directory is located:
```bash
cd $HOME/Downloads
```
compile files('lib/CodeChickenCore-1.7.10-1.0.4.29-dev.jar')
compile files('lib/CodeChickenLib-1.7.10-1.1.3.140-dev.jar')
compile files('lib/NotEnoughItems-1.7.10-1.0.3.74-dev.jar')
* Download the source code:
```bash
git clone https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
```
* Move or copy every file within the new folder into your directory, making sure to overwrite any files.
* Feel free to delete the remaining folder and rename your directory (such as "Hbm-s-Nuclear-Tech-GIT")
5. Enter the source directory
```bash
cd Hbm-s-Nuclear-Tech-GIT
```
which means you need to do one of the following things:
1) Find these exact versions of the dependencies, download them and put them into a folder called `libs` in your project's root folder. You can download a zip containing all files here: https://bit.ly/3fBxMq0
2) Find other versions, change the `build.gradle` file to reflect this difference and fix any potential errors this could cause (unlikely but not impossible)
3) Remove these dependencies from `build.gradle` along with all the API code. Note that this will break NEI-integration.
7. Open up the CMD in the root directory and run `gradlew build` on windows or `./gradlew build` on linux
8. Head over to `build/libs` and get the jar (named modid.jar)
9. Open the jar file with an archieve manager of your choice and insert the mod's asset folder into the jar's main directory
6. Setup forge decompilation workspace
```bash
./gradlew setupDecompWorkspace
```
### Necessary for Eclipse users
7. Generate eclipse files
```bash
./gradlew eclipse
```
8. Switch to the **eclipse** folder inside your directory as a workspace.
9. If necessary, make sure that Eclipse is using the JDK8.
* On Linux, enter Windows>Preferences>Java>Installed JREs.
* Click search to navigate to /usr/lib/jvm and open it. Select the Java 8 JDK (e.g., java-8-openjdk).
* Afterwards, enter Execution Environment, select JavaSE-1.8, and select the jre listed as a **[perfect match]**
* On Windows, you may need to set your JAVA_HOME.
* Search for Environment Variables and click Edit the System Environment Variables.
* Click Environment Variables. Click new under System Variables.
* Enter **JAVA_HOME** under Variable Name and enter the path to your JDK 8 under Variable Value (e.g., C:\Program-Files\Java\jdk1.8.0_102).
* In Eclipse, now enter Windows>Preferences>Java>Installed JREs.
* Click **Add Standard VM**; in the JRE home, navigate to the directory where the JDK is installed, then click finish and select it.
10. Code!
If you want to do some changes in the code yourself, start here after 6. and continue with 7. once you are done:
1) Get the IDE of your choice and prepare the workspace (for eclipse, it's `gradlew eclipse` or `./gradlew eclipse`, then use the eclipse folder as workspace directory in eclipse)
2) Meddle with the code, you can always test the code in the IDE (eclipse has a convenient green play button)
3) Save changes, close the IDE and continue with 7. of the previous list
## Contributing animations
Weapon animations in NTM are stored in JSON files, which are used alongside OBJ models to produce high quality animations with reasonable filesizes. Import/Export Blender addons are available for versions 2.79, 3.2, and 4.0 in `tools`, and they should function reasonably well in newer versions as well. See the comments in the header of the export scripts for usage instructions.
## Installation Instructions for a non-standard Workspace
## Compatibility notice
NTM has certain behaviors intended to fix vanilla code or to increase compatibility in certain cases where it otherwise would not be possible. These behaviors have the potential of not playing well with other mods, and while no such cases are currently known, here's a list of them.
I cannot offer any help on compiling the mod in a GregTech-workspace as I never managed to get it to work myself, here's a rough guide on how it might be possible:
1. Prepare the workspace
2. Slap this mod's `src` into the project's root directory
3. Pray
### Thermos
Thermos servers (along with its forks such as Crucible) have a "performance" feature that causes all tile entity ticking to slow down if there's no player present in the same chunk. For obvious reasons, this will heavily impact machines and cause phantom issues that, not having knowledge of this "performance" feature, are near impossible to diagnose. By default, NTM will crash on servers running the Thermos base code and print a lengthy message informing server owners about this "performance" feature as well as how to fix the issues it causes. The error message is printed in plain English on the top of the crash log, failure to read (as well as understand) it will leave the server inoperable.
### Shaders
Shaders (loaded by either Optifine, Iris or otherwise) will in all likelihood break when a gun is held. This is because guns need to skip vanilla's first person item setup for the rendering, however shaders apparently use the setup step for setting certain GL states, and skipping that will break rendering. [Shader Fixer](https://modrinth.com/mod/shader-fixer) is a mod with various fixes, among which is explicit compatibility for NTM's guns.
### Optifine
One of the most common "performance" mods on 1.7.10, Optifine, achieves an increase in performance by breaking small things in spots that are usually hard to notice, although this can cause severe issues with NTM. A short list of problems, along with some solutions, follows:
* Get rid of Optifine and use one of the many [other, less intrusive performance mods](https://gist.github.com/makamys/7cb74cd71d93a4332d2891db2624e17c).
* Blocks with connected textures may become invisible. This can be fixed by toggling triangulation (I do not know what or where this setting is, I just have been told that it exists and that it can fix the problem) or multicore chunk rendering (same here).
* Entity "optimization" has a tendency to break chunkloading, this is especially noticeable with missiles which rely heavily on chunkloading to work, causing them to freeze mid-air. It's unclear what setting might fix this, and analysis of Optifine's source code (or rather, lack thereof) has not proven useful either.
### Angelica
In older versions, Angelica caused issues regarding model rendering, often times making 3D models transparent. Ever since the switch to VBOs, models work fine. Another issue was blocks with connected textures not rendering at all, but this too was fixed, meaning as of time of writing there are no major incompatibilities known with Angelica. However there a few minor issues that persist, but those can be fixed:
* Often times when making a new world, all items appear as white squares. Somehow, scrolling though the NEI pages fixes this permanently
* Reeds will render weirdly, this is an incompatibility with the "Compact Vertex Format" feature. Disabling it will make reeds look normal. Alternatively, reed rendering can be disabled by using `/ntmclient set RENDER_REEDS false`, which works around the issue by not rendering the underwater portion of reeds at all.
### Skybox chainloader
NTM adds a few small things to the skybox using a custom skybox renderer. Minecraft can only have a single skybox renderer loaded, so setting the skybox to the NTM custom one would break compatibility with other mods' skyboxes. To mend this, NTM employs a **chainloader**. This chainloader will detect if a different skybox is loaded, save a reference to that skybox and then use NTM's skybox, which when used will also make sure to run the previous modded skybox renderer. In the event that NTM's skybox were to cause trouble, it can be disabled with the config option `1.31_enableSkyboxes`.
### Custom world provider
A world provider is a piece of code that minecraft can load to determine certain aspects of how the world should be handled, like light levels, sky color, day/night cycle, etc. In order for the Tom impact effects to work, NTM employs such a world provider, although this is known to cause issues with Hardcore Darkness. The world provider can be disabled with the config option `1.32_enableImpactWorldProvider`.
### Stat re-registering
An often overlooked aspect of Minecraft is its stats, the game keeps track of how many of an item were crafted, placed, broken, etc. By default, Minecraft can only handle vanilla items, modded items would not show up in the stats window. Forge does little to fix this, and since NTM has to keep track of certain things (such as the use of an acidizer for spawning Mask Man) it will run its own code which re-registers all stats for all modded items. In the event that re-registering causes issues, or another mod already does this better already, this behavior can be disabled with the config option `1.33_enableStatReRegistering`.
### Keybind overlap
An often annoying aspect of modded Minecraft is its keybinds. Even though multiple binds can be assigned the same key, all but one will show up as "conflicting" and only the non-conflicting one will work. Which one this is is usually arbitrary, and there is no reason to have such limitation. Often times keybinds are only applicable in certain scenarios, and a commonly found degree of overlap is within reason. Therefore, NTM will run its own key handling code which allows conflicting keybinds to work. If there should be any issues with this behavior, it can be disabled with the config option `1.34_enableKeybindOverlap`.
### Render distance capping
There is a common crash caused by Minecraft's render distance slider going out of bounds, this usually happens when uninstalling a mod that extends the render distance (like Optifine) or when downgrading the Minecraft version (newer versions have higher render distance caps). To prevent crashes, the mod will attempt to decrease the render distance if it's above 16 unless Optifine is installed. If this behavior is not desired (for example, because another mod that allows higher render distance is being used), it can be disabled with the config option `1.25_enableRenderDistCheck`.
### Log spam caused by ComparableStack
In some modpacks (exact mods needed to replicate this are unknown), it's possible that invalid registered items may cause problems for NEI handlers. To prevent crashes, the ComparableStack class used to represent stacks will default to a safe registered item, and print a log message. In certain situations, this may cause dozens of errors to be printed at once, potentially even lagging the game. If that happens, the log message (but not the error handling) can be disabled with the config option `1.28_enableSilentCompStackErrors`.
### Sound system limit
By default, the sound system only allows a limited amount of sounds to run at once (28 regular sounds and 4 streaming sounds), this causes issues when there's many machines running at once, since their looped sounds will constantly interrupt each other, causing them to immediately restart, which in some isolated cases has proven to cause massive lagspikes. To prevent this, NTM will increase the sound limit to 1000 regular sounds and 50 streaming sounds, this can be disabled with the config option `1.39_enableSoundExtension`.
# License
This software is licensed under the GNU Public License version 3. In short: This software is free, you may run the software freely, create modified versions, distribute this software and distribute modified versions, as long as the modified software too has a free software license. You win this round, Stallman. The full license can be found in the `LICENSE` file.
This software is licensed under the GNU Lesser General Public License version 3. In short: This software is free, you may run the software freely, create modified versions, distribute this software and distribute modified versions, as long as the modified software too has a free software license (with an exception for linking to this software, as stated by the "Lesser" part of the LGPL, where this may not be required). You win this round, Stallman. The full license can be found in the `LICENSE` and `LICENSE.LESSER` files.

View File

@ -1,56 +1,189 @@
import org.gradle.plugins.ide.eclipse.model.internal.FileReferenceFactory
import java.nio.file.Files
import java.nio.file.Paths
import java.nio.file.StandardCopyOption
buildscript {
repositories {
mavenCentral()
maven {
name = "forge"
url = "https://files.minecraftforge.net/maven"
}
maven {
name = "sonatype"
url = "https://oss.sonatype.org/content/repositories/snapshots/"
}
maven {
url = "https://repo1.maven.org/maven2/"
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
}
repositories {
maven { url = 'https://maven.ntmr.dev/proxy/' }
maven { url = 'https://maven.minecraftforge.net/' }
maven { url = 'https://plugins.gradle.org/m2' }
mavenCentral()
}
dependencies {
classpath ('com.anatawa12.forge:ForgeGradle:1.2-1.0.+') {changing = true}
}
}
apply plugin: 'forge'
apply plugin: 'curseforge'
version = "1.0"
group= "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "modid"
if(Files.exists(Paths.get("curseforge.properties"))) {
// Load CurseForge configuration
ext.cfprops = parseConfig(file("curseforge.properties"))
}
def version_name = version = mod_version
if(!mod_build_number.isEmpty()) {
version_name = mod_version + "_X" + mod_build_number
version = "[${version_name}]"
}
group = "com.hbm" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "HBM-NTM"
compileJava.options.encoding = 'UTF-8'
sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
minecraft {
version = "1.7.10-10.13.4.1558-1.7.10"
runDir = "eclipse"
version = "1.7.10-10.13.4.1614-1.7.10"
runDir = "eclipse"
}
// A little hack to fix codechicken's crazy maven structure (at least in 1.7.10)
eclipse.classpath.file.whenMerged { cp ->
// Find all codechicken source jars
def srcent = cp.entries.findAll { entry -> entry.path.contains("codechicken") && entry.path.endsWith("-src.jar") }
// Remove them from classpath
cp.entries.removeAll srcent
// Map the source entries to their dev counterparts based on basename
Map<String, File> srcmap = new HashMap<String, File>()
srcent.forEach { entry ->
def file = new File(entry.path)
srcmap.put(file.getName().replace("-src.jar", "-dev.jar"), file)
}
// Create file reference factory
def fileref = new FileReferenceFactory()
// Find all codechicken development jars
cp.entries.findAll { entry -> entry.path.contains("codechicken") && entry.path.endsWith("-dev.jar") }.forEach { entry ->
File srcmapping = new File(entry.path) // Initialize the srcmapping from the dev jar path
srcmapping = srcmap.get(srcmapping.getName()) // Transform it using the sourcemap
entry.sourcePath = fileref.fromFile(srcmapping) // Set the source path
}
}
repositories {
maven {
name = 'Blerg'
url = 'https://maven.ntmr.dev/proxy/'
}
maven {
name = 'ModMaven'
url = 'https://modmaven.dev'
}
maven {
name = "gt"
url = "https://gregtech.mechaenetia.com/"
}
//maven {
// name = "CurseForge"
// url = "https://minecraft.curseforge.com/api/maven/"
//}
maven {
name = "Jitpack"
url = "https://jitpack.io"
}
maven {
name = "CurseMaven"
url = "https://cursemaven.com"
}
maven {
name = "OpenComputers"
url = "https://maven.cil.li/"
}
}
dependencies {
compile files('lib/CodeChickenCore-1.7.10-1.0.4.29-dev.jar')
compile files('lib/CodeChickenLib-1.7.10-1.1.3.140-dev.jar')
compile files('lib/NotEnoughItems-1.7.10-1.0.3.74-dev.jar')
implementation 'codechicken:CodeChickenCore:1.7.10-1.0.4.29:dev'
compileOnly 'codechicken:CodeChickenCore:1.7.10-1.0.4.29:src'
implementation 'codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev'
compileOnly 'codechicken:CodeChickenLib:1.7.10-1.1.3.140:src'
implementation 'codechicken:NotEnoughItems:1.7.10-1.0.3.74:dev'
compileOnly 'codechicken:NotEnoughItems:1.7.10-1.0.3.74:src'
compileOnly "inventorytweaks:InventoryTweaks:1.59-dev:deobf"
implementation "li.cil.oc:OpenComputers:MC1.7.10-1.5.+:api"
compileOnly "com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta.56-GTNH:dev"
}
processResources
{
// this will ensure that this task is redone when the versions change.
inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version
processResources {
// this will ensure that this task is redone when the versions change.
inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version
// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'mcmod.info'
// replace version and mcversion
expand 'version':project.version, 'mcversion':project.minecraft.version
}
// copy everything else, thats not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'mcmod.info'
// replace version and mcversion
filesMatching('mcmod.info') {
// replace version, mcversion and credits
expand([
version: version_name,
credits: project.credits
])
}
}
// copy everything else, thats not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
}
// add AT to meta-inf
jar {
manifest {
attributes 'FMLAT': 'HBM_at.cfg'
}
}
task version {
doFirst {
println project.version
}
}
if(Files.exists(Paths.get("curseforge.properties"))) {
curse {
apiKey = cfprops.api_key
projectId = cfprops.project_id
releaseType = "release"
displayName = "Hbm's Nuclear Tech Mod " + version_name.replace("_", "") + " for Minecraft 1.7.10"
gameVersions.addAll([
"Forge",
"Java 8",
"Client", "Server"
])
if (Files.exists(Paths.get("changelog"))) {
changelog = String.join("\r\n", Files.readAllLines(Paths.get("changelog")))
// Perform a backup of the changelog and create a new file for next changes
doLast {
Files.move(Paths.get("changelog"), Paths.get("changelog.bak"), StandardCopyOption.REPLACE_EXISTING)
Files.createFile(Paths.get("changelog"))
}
}
}
}
// Properties file parsing helper
static def parseConfig(File config) {
config.withReader {
def prop = new Properties()
prop.load(it)
return (new ConfigSlurper().parse(prop))
}
}

27
changelog Normal file
View File

@ -0,0 +1,27 @@
## Changed
* Updated russian localization
* Rad absorbers now use metadata, existing blocks will be converted automatically
* Fissure bombs that go off in crater biomes now create fissures with metadata 1 which creates radioactive volcanic lava
* If a crater biome is created on top of an existing fissure, it will keep producing normal volcanic lava
* Simplified the battery socket's client packets, reducing CPU load
* Muzzle flashes on guns now work in third person mode, including on other players and on NPCs, making it more apparent when you're being fired at
* This includes non-standard special effects like the .44 gap flash and the .35-800 ejector plume
* Removed the old unused satelite deco blocks, freeing up 6 block IDs
* Crucibles that smelt metal with no template set will no place the metal in the recipe stack instead of the waste stack, this should make it easier to get a recipe to work in the many, many cases where people add the template after smelting the material
* Battery sockets and the FENSU now support the copy tool
* Removed unused displaylist support from the model loader
* DLs have been long phased out in favor of VBOs anyway
* Rebranded canned horse slime
* Now with extra bone marrow
* Updated the deuterium tower's model
* Increased the energy requirement for welding osmiridium
# Fixed
* Potentially fixed yet another issue regarding crates
* Fixed battery socket `fillpercent` RoR function always assuming a max power of 1
* Fixed issue where multiblock ports would generate many OpenComputers component entries
* Fixed RBMK automatic control rods having incorrect settings when using the copy tool
* Fixed battery sockets producing junk debug data in the logs
* Fixed an issue where the charging station would crash when trying to charge certain items
* Fixed the DFC's core component not dropping its contents when mined
* Fixed audio problems with guns

View File

@ -0,0 +1,5 @@
# CurseForge API token (obtainable from https://legacy.curseforge.com/account/api-tokens)
api_key=
# CurseForge project ID
project_id=

80
gradle.properties Normal file
View File

@ -0,0 +1,80 @@
mod_version=1.0.27
# Empty build number makes a release type
mod_build_number=5572
credits=HbMinecraft,\
\ rodolphito (explosion algorithms),\
\ grangerave (explosion algorithms),\
\ Hoboy (textures, models),\
\ Drillgon200 (effects, models),\
\ MartinTheDragon (calculator, chunk-based fallout, bendable cranes, pipe improvements, PWR sounds),\
\ Alcater (GUI textures),\
\ MellowArpeggiation (new animation system, turbine sounds, sound fixes, industrial lights, conveyor wand, NBT structures, MSU displays),\
\ Pheo (textures, various machines, models, weapons),\
\ Vær (gas centrifuges, better worldgen, ZIRNOX, CP-1 parts, starter guide, new cyclotron, weapon animations),\
\ UFFR (RTG pellets, guns, casings, euphemium capacitor, nucleartech.wiki),\
\ LePeep (coilgun model, BDCL QC),\
\ Adam29 (liquid petroleum, ethanol, electric furnace),\
\ Pvndols (thorium fuel recipe, gas turbine),\
\ JamesH2 (blood mechanics, nitric acid, particle emitter),\
\ Lazzzycat (structures, mob gear),\
\ PastaBaguette (coal horse decal),\
\ Doctor17 (russian localization)),\
\ Pashtet (russian localization),\
\ 7H40 (russian localization),\
\ RayzerHan (russian localization),\
\ Bismarck (chinese localization),\
\ Creeper-banner (chinese localization),\
\ 5467864 (chinese localization),\
\ eeeeee0a (chinese localization),\
\ hz0909adc (chinese localization),\
\ LSKLW (chinese localization),\
\ R-Kaenbyou (chinese localization),\
\ scp-000000000 (chinese localization),\
\ UnnameTokiko (chinese localization),\
\ Herobrine 457985 (chinese localization),\
\ xxwinhere (chinese localization),\
\ Nycticoraxnightheron (chinese localization),\
\ NarekoMichigami810 (chinese localization),\
\ Maksymisio (polish localization)\
\ el3ctro4ndre (italian localization),\
\ Goaty1208 (italian localization),\
\ Pu-238 (Tom impact effects),\
\ Frooz (gun models),\
\ VT-6/24 (models, textures),\
\ Nos (models),\
\ WushiThe (models),\
\ Minecreep (models),\
\ ackbarcrowbars (models),\
\ haru315 (spiral point algorithm),\
\ mlbv (threaded MK5),\
\ 70k (textures, glyphid AI, strand caster, electrolyzer changes, cryolite),\
\ instantnootles (concept artist),\
\ Sten89 (models),\
\ Pixelguru26 (textures),\
\ TheBlueHat (textures),\
\ Burningwater202 (laminate glass),\
\ TehTemmie (reacher radiation function),\
\ Silly541 (config for safe ME drives),\
\ Voxelstice (OpenComputers integration, turbine spinup),\
\ BallOfEnergy1 (OpenComputers integration, RBMK and packet optimization, crate backpacks),\
\ PewPewCricket (OpenComputers integration),\
\ kelllllen (OpenComputers integration),\
\ sdddddf80 (recipe configs, chinese localization, custom machine holograms),\
\ Abel1502 (abilities GUI, optimization, crate upgrade recipes, strand caster improvements, varous tweaks),\
\ Darek505 (armor rendering compatibility fix),\
\ ranch21 (improved HUD gauges),\
\ SuperCraftAlex (tooltips)\
\ Ice-Arrow (research reactor tweaks),\
\ 245tt (anvil GUI improvements),\
\ KoblizekXD (doors),\
\ FOlkvangrField (custom machine parts),\
\ RosaTryp (centrifuge config),\
\ Toshayo (satellite loot system, project settings, gradle curse task, OpenComputers integration, fluid counter valve),\
\ Dash (PA particle serialization fix),\
\ archiecarrot123 (armor rendering compatibility fix),\
\ mikkerlo (mining laser & builder's jetpack improvements),\
\ icomet (refactoring),\
\ martemen (project settings),\
\ OvermindDL1 (project settings),\
\ impbk2002 (project settings)\

View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip

View File

@ -0,0 +1,10 @@
package api.hbm.block;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
public interface IBlowable { //sloppy toppy
/** Called server-side when a fan blows on an IBlowable in range every tick. */
public void applyFan(World world, int x, int y, int z, ForgeDirection dir, int dist);
}

View File

@ -0,0 +1,25 @@
package api.hbm.block;
import com.hbm.inventory.material.Mats.MaterialStack;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
public interface ICrucibleAcceptor {
/*
* Pouring: The metal leaves the channel/crucible and usually (but not always) falls down. The additional double coords give a more precise impact location.
* Also useful for entities like large crucibles since they are filled from the top.
*/
//public boolean canAcceptPour(World world, int x, int y, int z, double dX, double dY, double dZ, ForgeDirection side, MaterialStack stack);
public boolean canAcceptPartialPour(World world, int x, int y, int z, double dX, double dY, double dZ, ForgeDirection side, MaterialStack stack);
public MaterialStack pour(World world, int x, int y, int z, double dX, double dY, double dZ, ForgeDirection side, MaterialStack stack);
/*
* Flowing: The "safe" transfer of metal using a channel or other means, usually from block to block and usually horizontally (but not necessarily).
* May also be used for entities like minecarts that could be loaded from the side.
*/
//public boolean canAcceptFlow(World world, int x, int y, int z, ForgeDirection side, MaterialStack stack);
public boolean canAcceptPartialFlow(World world, int x, int y, int z, ForgeDirection side, MaterialStack stack);
public MaterialStack flow(World world, int x, int y, int z, ForgeDirection side, MaterialStack stack);
}

View File

@ -0,0 +1,43 @@
package api.hbm.block;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
@Deprecated
public interface IDrillInteraction {
/**
* Whether the breaking of the block should be successful. Will destroy the block and not drop anything from clusters.
* Should use a random function, otherwise the clusters will stay there indefinitely printing free ore.
* @param world
* @param x
* @param y
* @param z
* @param drill Might be a tool, tile entity or anything that breaks blocks
* @return
*/
public boolean canBreak(World world, int x, int y, int z, int meta, IMiningDrill drill);
/**
* Returns an itemstack, usually when the block is not destroyed. Laser drills may drop this and mechanical drills will add it to their inventories.
* @param world
* @param x
* @param y
* @param z
* @param drill Might be a tool, tile entity or anything that breaks blocks
* @return
*/
public ItemStack extractResource(World world, int x, int y, int z, int meta, IMiningDrill drill);
/**
* The hardness that should be considered instead of the hardness value of the block itself
* @param world
* @param x
* @param y
* @param z
* @param meta
* @param drill
* @return
*/
public float getRelativeHardness(World world, int x, int y, int z, int meta, IMiningDrill drill);
}

View File

@ -0,0 +1,15 @@
package api.hbm.block;
import com.hbm.entity.item.EntityTNTPrimedBase;
import net.minecraft.world.World;
public interface IFuckingExplode {
// Anything that can be detonated by another explosion should implement this and spawn an EntityTNTPrimedBase when hit by an explosion
// This prevents chained explosions causing a stack overflow
// Note that the block can still safely immediately explode, as long as the source isn't another explosion
public void explodeEntity(World world, double x, double y, double z, EntityTNTPrimedBase entity);
}

View File

@ -0,0 +1,10 @@
package api.hbm.block;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
public interface IInsertable { //uwu
public boolean insertItem(World world, int x, int y, int z, ForgeDirection dir, ItemStack stack);
}

View File

@ -0,0 +1,11 @@
package api.hbm.block;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
//applicable to blocks and tile entities
public interface ILaserable {
public void addEnergy(World world, int x, int y, int z, long energy, ForgeDirection dir);
}

View File

@ -0,0 +1,23 @@
package api.hbm.block;
@Deprecated
public interface IMiningDrill {
/**
* What era the drill belongs to, usually for IDrillInteraction to adjust outputs
* @return
*/
public DrillType getDrillTier();
/**
* An arbitrary "rating" of the drill. Hand powered pre-industrial drills would be <10, the auto mining drill is 50 and the laser miner is 100.
* @return
*/
public int getDrillRating();
public static enum DrillType {
PRIMITIVE,
INDUSTRIAL,
HITECH
}
}

View File

@ -0,0 +1,6 @@
package api.hbm.block;
public interface IPileNeutronReceiver {
public void receiveNeutrons(int n);
}

View File

@ -0,0 +1,9 @@
package api.hbm.block;
import net.minecraft.world.World;
public interface IRadioControllable {
public String[] getVariables(World world, int x, int y, int z);
public void receiveSignal(World world, int x, int y, int z, String channel, String signal);
}

View File

@ -0,0 +1,47 @@
package api.hbm.block;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import com.hbm.inventory.RecipesCommon.ComparableStack;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
public interface IToolable {
public boolean onScrew(World world, EntityPlayer player, int x, int y, int z, int side, float fX, float fY, float fZ, ToolType tool);
public static enum ToolType {
SCREWDRIVER,
HAND_DRILL,
DEFUSER,
WRENCH,
TORCH,
BOLT;
public List<ItemStack> stacksForDisplay = new ArrayList();
private static HashMap<ComparableStack, ToolType> map = new HashMap();
public void register(ItemStack stack) {
stacksForDisplay.add(stack);
}
public static ToolType getType(ItemStack stack) {
if(!map.isEmpty()) {
return map.get(new ComparableStack(stack));
}
for(ToolType type : ToolType.values()) {
for(ItemStack tool : type.stacksForDisplay) {
map.put(new ComparableStack(tool), type);
}
}
return map.get(new ComparableStack(stack));
}
}
}

View File

@ -0,0 +1,12 @@
package api.hbm.conveyor;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
public interface IConveyorBelt {
/** Returns true if the item should stay on the conveyor, false if the item should drop off */
public boolean canItemStay(World world, int x, int y, int z, Vec3 itemPos);
public Vec3 getTravelLocation(World world, int x, int y, int z, Vec3 itemPos, double speed);
public Vec3 getClosestSnappingPosition(World world, int x, int y, int z, Vec3 itemPos);
}

View File

@ -0,0 +1,8 @@
package api.hbm.conveyor;
import net.minecraft.item.ItemStack;
public interface IConveyorItem {
public ItemStack getItemStack();
}

View File

@ -0,0 +1,8 @@
package api.hbm.conveyor;
import net.minecraft.item.ItemStack;
public interface IConveyorPackage {
public ItemStack[] getItemStacks();
}

View File

@ -0,0 +1,23 @@
package api.hbm.conveyor;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
public interface IEnterableBlock {
/**
* Returns true of the moving item can enter from the given side. When this happens, the IConveyorItem will call onEnter and despawn
* @param world
* @param x
* @param y
* @param z
* @param dir
* @param entity
* @return
*/
public boolean canItemEnter(World world, int x, int y, int z, ForgeDirection dir, IConveyorItem entity);
public void onItemEnter(World world, int x, int y, int z, ForgeDirection dir, IConveyorItem entity);
public boolean canPackageEnter(World world, int x, int y, int z, ForgeDirection dir, IConveyorPackage entity);
public void onPackageEnter(World world, int x, int y, int z, ForgeDirection dir, IConveyorPackage entity);
}

View File

@ -1,14 +0,0 @@
package api.hbm.energy;
import net.minecraft.item.ItemStack;
public interface IBatteryItem {
public void chargeBattery(ItemStack stack, long i);
public void setCharge(ItemStack stack, long i);
public void dischargeBattery(ItemStack stack, long i);
public long getCharge(ItemStack stack);
public long getMaxCharge();
public long getChargeRate();
public long getDischargeRate();
}

View File

@ -1,5 +0,0 @@
package api.hbm.energy;
public interface IEnergyConsumer {
/// WIP ///
}

View File

@ -1,5 +0,0 @@
package api.hbm.energy;
public interface IEnergySource {
/// WIP ///
}

View File

@ -0,0 +1,43 @@
package api.hbm.energymk2;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
public interface IBatteryItem {
public void chargeBattery(ItemStack stack, long i);
public void setCharge(ItemStack stack, long i);
public void dischargeBattery(ItemStack stack, long i);
public long getCharge(ItemStack stack);
public long getMaxCharge(ItemStack stack);
public long getChargeRate(ItemStack stack);
public long getDischargeRate(ItemStack stack);
/** Returns a string for the NBT tag name of the long storing power */
public default String getChargeTagName() {
return "charge";
}
/** Returns a string for the NBT tag name of the long storing power */
public static String getChargeTagName(ItemStack stack) {
return ((IBatteryItem) stack.getItem()).getChargeTagName();
}
/** Returns an empty battery stack from the passed ItemStack, the original won't be modified */
public static ItemStack emptyBattery(ItemStack stack) {
if(stack != null && stack.getItem() instanceof IBatteryItem) {
String keyName = getChargeTagName(stack);
ItemStack stackOut = stack.copy();
stackOut.stackTagCompound = new NBTTagCompound();
stackOut.stackTagCompound.setLong(keyName, 0);
return stackOut.copy();
}
return null;
}
/** Returns an empty battery stack from the passed Item */
public static ItemStack emptyBattery(Item item) {
return item instanceof IBatteryItem ? emptyBattery(new ItemStack(item)) : null;
}
}

View File

@ -0,0 +1,23 @@
package api.hbm.energymk2;
import com.hbm.lib.Library;
import com.hbm.util.fauxpointtwelve.BlockPos;
import com.hbm.util.fauxpointtwelve.DirPos;
import api.hbm.energymk2.Nodespace.PowerNode;
import net.minecraft.tileentity.TileEntity;
public interface IEnergyConductorMK2 extends IEnergyConnectorMK2 {
public default PowerNode createNode() {
TileEntity tile = (TileEntity) this;
return new PowerNode(new BlockPos(tile.xCoord, tile.yCoord, tile.zCoord)).setConnections(
new DirPos(tile.xCoord + 1, tile.yCoord, tile.zCoord, Library.POS_X),
new DirPos(tile.xCoord - 1, tile.yCoord, tile.zCoord, Library.NEG_X),
new DirPos(tile.xCoord, tile.yCoord + 1, tile.zCoord, Library.POS_Y),
new DirPos(tile.xCoord, tile.yCoord - 1, tile.zCoord, Library.NEG_Y),
new DirPos(tile.xCoord, tile.yCoord, tile.zCoord + 1, Library.POS_Z),
new DirPos(tile.xCoord, tile.yCoord, tile.zCoord - 1, Library.NEG_Z)
);
}
}

View File

@ -0,0 +1,24 @@
package api.hbm.energymk2;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.util.ForgeDirection;
/**
* Interface for all blocks that should visually connect to cables without having an IEnergyConnector tile entity.
* This is meant for BLOCKS
* @author hbm
*
*/
public interface IEnergyConnectorBlock {
/**
* Same as IEnergyConnector's method but for regular blocks that might not even have TEs. Used for rendering only!
* @param world
* @param x
* @param y
* @param z
* @param dir
* @return
*/
public boolean canConnect(IBlockAccess world, int x, int y, int z, ForgeDirection dir);
}

View File

@ -0,0 +1,16 @@
package api.hbm.energymk2;
import net.minecraftforge.common.util.ForgeDirection;
public interface IEnergyConnectorMK2 {
/**
* Whether the given side can be connected to
* dir refers to the side of this block, not the connecting block doing the check
* @param dir
* @return
*/
public default boolean canConnect(ForgeDirection dir) {
return dir != ForgeDirection.UNKNOWN;
}
}

View File

@ -0,0 +1,29 @@
package api.hbm.energymk2;
import com.hbm.util.CompatEnergyControl;
import api.hbm.tile.ILoadedTile;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Vec3;
/** DO NOT USE DIRECTLY! This is simply the common ancestor to providers and receivers, because all this behavior has to be excluded from conductors! */
public interface IEnergyHandlerMK2 extends IEnergyConnectorMK2, ILoadedTile {
public long getPower();
public void setPower(long power);
public long getMaxPower();
public static final boolean particleDebug = false;
public default Vec3 getDebugParticlePosMK2() {
TileEntity te = (TileEntity) this;
Vec3 vec = Vec3.createVectorHelper(te.xCoord + 0.5, te.yCoord + 1, te.zCoord + 0.5);
return vec;
}
public default void provideInfoForECMK2(NBTTagCompound data) {
data.setLong(CompatEnergyControl.L_ENERGY_HE, this.getPower());
data.setLong(CompatEnergyControl.L_CAPACITY_HE, this.getMaxPower());
}
}

View File

@ -0,0 +1,67 @@
package api.hbm.energymk2;
import com.hbm.handler.threading.PacketThreading;
import com.hbm.packet.toclient.AuxParticlePacketNT;
import api.hbm.energymk2.Nodespace.PowerNode;
import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
/** If it sends energy, use this */
public interface IEnergyProviderMK2 extends IEnergyHandlerMK2 {
/** Uses up available power, default implementation has no sanity checking, make sure that the requested power is lequal to the current power */
public default void usePower(long power) {
this.setPower(this.getPower() - power);
}
public default long getProviderSpeed() {
return this.getMaxPower();
}
public default void tryProvide(World world, int x, int y, int z, ForgeDirection dir) {
TileEntity te = TileAccessCache.getTileOrCache(world, x, y, z);
boolean red = false;
if(te instanceof IEnergyConductorMK2) {
IEnergyConductorMK2 con = (IEnergyConductorMK2) te;
if(con.canConnect(dir.getOpposite())) {
PowerNode node = Nodespace.getNode(world, x, y, z);
if(node != null && node.net != null) {
node.net.addProvider(this);
red = true;
}
}
}
if(te instanceof IEnergyReceiverMK2 && te != this) {
IEnergyReceiverMK2 rec = (IEnergyReceiverMK2) te;
if(rec.canConnect(dir.getOpposite()) && rec.allowDirectProvision()) {
long provides = Math.min(this.getPower(), this.getProviderSpeed());
long receives = Math.min(rec.getMaxPower() - rec.getPower(), rec.getReceiverSpeed());
long toTransfer = Math.min(provides, receives);
toTransfer -= rec.transferPower(toTransfer);
this.usePower(toTransfer);
}
}
if(particleDebug) {
NBTTagCompound data = new NBTTagCompound();
data.setString("type", "network");
data.setString("mode", "power");
double posX = x + 0.5 - dir.offsetX * 0.5 + world.rand.nextDouble() * 0.5 - 0.25;
double posY = y + 0.5 - dir.offsetY * 0.5 + world.rand.nextDouble() * 0.5 - 0.25;
double posZ = z + 0.5 - dir.offsetZ * 0.5 + world.rand.nextDouble() * 0.5 - 0.25;
data.setDouble("mX", dir.offsetX * (red ? 0.025 : 0.1));
data.setDouble("mY", dir.offsetY * (red ? 0.025 : 0.1));
data.setDouble("mZ", dir.offsetZ * (red ? 0.025 : 0.1));
PacketThreading.createAllAroundThreadedPacket(new AuxParticlePacketNT(data, posX, posY, posZ), new TargetPoint(world.provider.dimensionId, posX, posY, posZ, 25));
}
}
}

View File

@ -0,0 +1,95 @@
package api.hbm.energymk2;
import com.hbm.handler.threading.PacketThreading;
import com.hbm.interfaces.NotableComments;
import com.hbm.packet.toclient.AuxParticlePacketNT;
import com.hbm.util.fauxpointtwelve.DirPos;
import api.hbm.energymk2.Nodespace.PowerNode;
import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
/** If it receives energy, use this */
@NotableComments
public interface IEnergyReceiverMK2 extends IEnergyHandlerMK2 {
public default long transferPower(long power) {
if(power + this.getPower() <= this.getMaxPower()) {
this.setPower(power + this.getPower());
return 0;
}
long capacity = this.getMaxPower() - this.getPower();
long overshoot = power - capacity;
this.setPower(this.getMaxPower());
return overshoot;
}
public default long getReceiverSpeed() {
return this.getMaxPower();
}
/** Whether a provider can provide power by touching the block (i.e. via proxies), bypassing the need for a network entirely */
public default boolean allowDirectProvision() { return true; }
public default void trySubscribe(World world, DirPos pos) { trySubscribe(world, pos.getX(), pos.getY(), pos.getZ(), pos.getDir()); }
public default void trySubscribe(World world, int x, int y, int z, ForgeDirection dir) {
TileEntity te = TileAccessCache.getTileOrCache(world, x, y, z);
boolean red = false;
if(te instanceof IEnergyConductorMK2) {
IEnergyConductorMK2 con = (IEnergyConductorMK2) te;
if(!con.canConnect(dir.getOpposite())) return;
PowerNode node = Nodespace.getNode(world, x, y, z);
if(node != null && node.net != null) {
node.net.addReceiver(this);
red = true;
}
}
if(particleDebug) {
NBTTagCompound data = new NBTTagCompound();
data.setString("type", "network");
data.setString("mode", "power");
double posX = x + 0.5 + dir.offsetX * 0.5 + world.rand.nextDouble() * 0.5 - 0.25;
double posY = y + 0.5 + dir.offsetY * 0.5 + world.rand.nextDouble() * 0.5 - 0.25;
double posZ = z + 0.5 + dir.offsetZ * 0.5 + world.rand.nextDouble() * 0.5 - 0.25;
data.setDouble("mX", -dir.offsetX * (red ? 0.025 : 0.1));
data.setDouble("mY", -dir.offsetY * (red ? 0.025 : 0.1));
data.setDouble("mZ", -dir.offsetZ * (red ? 0.025 : 0.1));
PacketThreading.createAllAroundThreadedPacket(new AuxParticlePacketNT(data, posX, posY, posZ), new TargetPoint(world.provider.dimensionId, posX, posY, posZ, 25));
}
}
public default void tryUnsubscribe(World world, int x, int y, int z) {
TileEntity te = world.getTileEntity(x, y, z);
if(te instanceof IEnergyConductorMK2) {
IEnergyConductorMK2 con = (IEnergyConductorMK2) te;
PowerNode node = con.createNode();
if(node != null && node.net != null) {
node.net.removeReceiver(this);
}
}
}
public enum ConnectionPriority {
LOWEST,
LOW,
NORMAL,
HIGH,
HIGHEST
}
public default ConnectionPriority getPriority() {
return ConnectionPriority.NORMAL;
}
}

View File

@ -0,0 +1,62 @@
package api.hbm.energymk2;
import com.hbm.interfaces.NotableComments;
import com.hbm.uninos.GenNode;
import com.hbm.uninos.UniNodespace;
import com.hbm.uninos.networkproviders.PowerNetProvider;
import com.hbm.util.fauxpointtwelve.BlockPos;
import com.hbm.util.fauxpointtwelve.DirPos;
import net.minecraft.world.World;
/**
* The dead fucking corpse of nodespace MK1.
* A fantastic proof of concept, but ultimately it was killed for being just not that versatile.
* This class is mostly just a compatibility husk that should allow uninodespace to slide into the mod with as much lubrication as it deserves.
*
* @author hbm
*/
@NotableComments
public class Nodespace {
public static final PowerNetProvider THE_POWER_PROVIDER = new PowerNetProvider();
@Deprecated public static PowerNode getNode(World world, int x, int y, int z) {
return (PowerNode) UniNodespace.getNode(world, x, y, z, THE_POWER_PROVIDER);
}
@Deprecated public static void createNode(World world, PowerNode node) {
UniNodespace.createNode(world, node);
}
@Deprecated public static void destroyNode(World world, int x, int y, int z) {
UniNodespace.destroyNode(world, x, y, z, THE_POWER_PROVIDER);
}
@NotableComments
public static class PowerNode extends GenNode<PowerNetMK2> {
/**
* Okay so here's the deal: The code has shit idiot brain fungus. I don't know why. I re-tested every part involved several times.
* I don't know why. But for some reason, during neighbor checks, on certain arbitrary fucking places, the joining operation just fails.
* Disallowing nodes to create new networks fixed the problem completely, which is hardly surprising since they wouldn't be able to make
* a new net anyway and they will re-check neighbors until a net is found, so the solution is tautological in nature. So I tried limiting
* creation of new networks. Didn't work. So what's there left to do? Hand out a mark to any node that has changed networks, and let those
* recently modified nodes do another re-check. This creates a second layer of redundant operations, and in theory doubles (in practice,
* it might be an extra 20% due to break-off section sizes) the amount of CPU time needed for re-building the networks after joining or
* breaking, but it seems to allow those parts to connect back to their neighbor nets as they are supposed to. I am not proud of this solution,
* this issue shouldn't exist to begin with and I am going fucking insane but it is what it is.
*/
public PowerNode(BlockPos... positions) {
super(THE_POWER_PROVIDER, positions);
this.positions = positions;
}
@Override
public PowerNode setConnections(DirPos... connections) {
super.setConnections(connections);
return this;
}
}
}

View File

@ -0,0 +1,156 @@
package api.hbm.energymk2;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import com.hbm.uninos.NodeNet;
import com.hbm.util.Tuple.Pair;
import java.util.Map.Entry;
import api.hbm.energymk2.IEnergyReceiverMK2.ConnectionPriority;
import api.hbm.energymk2.Nodespace.PowerNode;
/**
* Technically MK3 since it's now UNINOS compatible, although UNINOS was build out of 95% nodespace code
*
* @author hbm
*/
public class PowerNetMK2 extends NodeNet<IEnergyReceiverMK2, IEnergyProviderMK2, PowerNode> {
public long energyTracker = 0L;
protected static int timeout = 3_000;
@Override public void resetTrackers() { this.energyTracker = 0; }
@Override
public void update() {
if(providerEntries.isEmpty()) return;
if(receiverEntries.isEmpty()) return;
long timestamp = System.currentTimeMillis();
List<Pair<IEnergyProviderMK2, Long>> providers = new ArrayList();
long powerAvailable = 0;
// sum up available power
Iterator<Entry<IEnergyProviderMK2, Long>> provIt = providerEntries.entrySet().iterator();
while(provIt.hasNext()) {
Entry<IEnergyProviderMK2, Long> entry = provIt.next();
if(timestamp - entry.getValue() > timeout || isBadLink(entry.getKey())) { provIt.remove(); continue; }
long src = Math.min(entry.getKey().getPower(), entry.getKey().getProviderSpeed());
if(src > 0) {
providers.add(new Pair(entry.getKey(), src));
powerAvailable += src;
}
}
// sum up total demand, categorized by priority
List<Pair<IEnergyReceiverMK2, Long>>[] receivers = new ArrayList[ConnectionPriority.values().length];
for(int i = 0; i < receivers.length; i++) receivers[i] = new ArrayList();
long[] demand = new long[ConnectionPriority.values().length];
long totalDemand = 0;
Iterator<Entry<IEnergyReceiverMK2, Long>> recIt = receiverEntries.entrySet().iterator();
while(recIt.hasNext()) {
Entry<IEnergyReceiverMK2, Long> entry = recIt.next();
if(timestamp - entry.getValue() > timeout || isBadLink(entry.getKey())) { recIt.remove(); continue; }
long rec = Math.min(entry.getKey().getMaxPower() - entry.getKey().getPower(), entry.getKey().getReceiverSpeed());
if(rec > 0) {
int p = entry.getKey().getPriority().ordinal();
receivers[p].add(new Pair(entry.getKey(), rec));
demand[p] += rec;
totalDemand += rec;
}
}
long toTransfer = Math.min(powerAvailable, totalDemand);
long energyUsed = 0;
// add power to receivers, ordered by priority
for(int i = ConnectionPriority.values().length - 1; i >= 0; i--) {
List<Pair<IEnergyReceiverMK2, Long>> list = receivers[i];
long priorityDemand = demand[i];
for(Pair<IEnergyReceiverMK2, Long> entry : list) {
double weight = (double) entry.getValue() / (double) (priorityDemand);
long toSend = (long) Math.min(Math.max(toTransfer * weight, 0D), entry.getValue());
energyUsed += (toSend - entry.getKey().transferPower(toSend)); //leftovers are subtracted from the intended amount to use up
}
toTransfer -= energyUsed;
}
this.energyTracker += energyUsed;
long leftover = energyUsed;
// remove power from providers
for(Pair<IEnergyProviderMK2, Long> entry : providers) {
double weight = (double) entry.getValue() / (double) powerAvailable;
long toUse = (long) Math.max(energyUsed * weight, 0D);
entry.getKey().usePower(toUse);
leftover -= toUse;
}
// rounding error compensation, detects surplus that hasn't been used and removes it from random providers
int iterationsLeft = 100; // whiles without emergency brakes are a bad idea
while(iterationsLeft > 0 && leftover > 0 && providers.size() > 0) {
iterationsLeft--;
Pair<IEnergyProviderMK2, Long> selected = providers.get(rand.nextInt(providers.size()));
IEnergyProviderMK2 scapegoat = selected.getKey();
long toUse = Math.min(leftover, scapegoat.getPower());
scapegoat.usePower(toUse);
leftover -= toUse;
}
}
public long sendPowerDiode(long power) {
if(receiverEntries.isEmpty()) return power;
long timestamp = System.currentTimeMillis();
List<Pair<IEnergyReceiverMK2, Long>>[] receivers = new ArrayList[ConnectionPriority.values().length];
for(int i = 0; i < receivers.length; i++) receivers[i] = new ArrayList();
long[] demand = new long[ConnectionPriority.values().length];
long totalDemand = 0;
Iterator<Entry<IEnergyReceiverMK2, Long>> recIt = receiverEntries.entrySet().iterator();
while(recIt.hasNext()) {
Entry<IEnergyReceiverMK2, Long> entry = recIt.next();
if(timestamp - entry.getValue() > timeout) { recIt.remove(); continue; }
long rec = Math.min(entry.getKey().getMaxPower() - entry.getKey().getPower(), entry.getKey().getReceiverSpeed());
int p = entry.getKey().getPriority().ordinal();
receivers[p].add(new Pair(entry.getKey(), rec));
demand[p] += rec;
totalDemand += rec;
}
long toTransfer = Math.min(power, totalDemand);
long energyUsed = 0;
for(int i = ConnectionPriority.values().length - 1; i >= 0; i--) {
List<Pair<IEnergyReceiverMK2, Long>> list = receivers[i];
long priorityDemand = demand[i];
for(Pair<IEnergyReceiverMK2, Long> entry : list) {
double weight = (double) entry.getValue() / (double) (priorityDemand);
long toSend = (long) Math.max(toTransfer * weight, 0D);
energyUsed += (toSend - entry.getKey().transferPower(toSend)); //leftovers are subtracted from the intended amount to use up
}
toTransfer -= energyUsed;
}
this.energyTracker += energyUsed;
return power - energyUsed;
}
}

View File

@ -0,0 +1,33 @@
/**
*
*/
/**
* @author hbm
*
*/
package api.hbm.energymk2;
// i have snorted two lines of pure caffeine and taken one large paracetamol laced with even more caffine, let's fucking go
//most of the new classes are just copy pasted mashed up shit from yesteryear, what a productive segment that was
/*
before my caffine high ends entirely and i black out, here's the gist:
* diodes are handled like energy receiver and simply chain-load the power net they output into in a recursive function, this might be a bit laggy compared to the rest of the system, but it's still way less laggy than the old one
* instead of power nets being bound to tile entities directly, tiles spawn ethereal "nodes" similar to the drone waypoints which can be saved using world data, meaning that breaking cables will delete nodes, but unloading them will keep them alive in "node space" which is what's actually used to check for connections
* power nets may cache some positional info in order to limit the amount of nodes, this should prevent horrific freezes in the unlikely event that some retard makes a superflat world out of cables
* general energy transmission will work in a similar fashion as martin explained his, but somewhat simplified; the system will determine supply and demand and then split those evenly if possible, retrying within one operation is only necessary for minor restrictions like priority, any leftovers from rounding don't have to be re-tried because the next tick will already take care of that
* invest funds in more coal mare nudes
* battery "fair share" transfer will most likely no longer work, but that's not really as relevant these days considering there's capacitors and because batteries have transfer speed limits anyway
* most of the machine's functions will be repurposed, the "sendPower" method will no longer send power directly but register the machine to the network as a power source
* if all else fails and martin still hasn't surrendered his code, i will beg greg for his wisdom (but without loss or tiering because fuck that)
*
* | | ||
* ____|____
* |
* || | |_
*
* ...i said WITHOUT loss
*/

View File

@ -1,5 +1,6 @@
package api.hbm.entity;
@Deprecated //Use IRadarDetectableNT instead, old interface will still work though
public interface IRadarDetectable {
public static enum RadarTargetType {
@ -14,7 +15,8 @@ public interface IRadarDetectable {
MISSILE_15_20("Size 15/20 Custom Missile"), //size 15/20 custom missiles
MISSILE_20("Size 20 Custom Missile"), //size 20 custom missiles
MISSILE_AB("Anti-Ballistic Missile"), //anti ballistic missile
PLAYER("Player"); //airborne players
PLAYER("Player"), //airborne players
ARTILLERY("Artillery Shell"); //artillery shells
public String name;

View File

@ -0,0 +1,45 @@
package api.hbm.entity;
public interface IRadarDetectableNT {
public static final int TIER0 = 0;
public static final int TIER1 = 1;
public static final int TIER2 = 2;
public static final int TIER3 = 3;
public static final int TIER4 = 4;
public static final int TIER10 = 5;
public static final int TIER10_15 = 6;
public static final int TIER15 = 7;
public static final int TIER15_20 = 8;
public static final int TIER20 = 9;
public static final int TIER_AB = 10;
public static final int PLAYER = 11;
public static final int ARTY = 12;
/** Reserved type that shows a unique purple blip. Used for when nothing else applies. */
public static final int SPECIAL = 13;
/** Name use for radar display, uses I18n for lookup */
public String getUnlocalizedName();
/** The type of dot to show on the radar as well as the redstone level in tier mode */
public int getBlipLevel();
/** Whether the object can be seen by this type of radar */
public boolean canBeSeenBy(Object radar);
/** Whether the object is currently visible, as well as whether the radar's setting allow for picking this up */
public boolean paramsApplicable(RadarScanParams params);
/** Whether this radar entry should be counted for the redstone output */
public boolean suppliesRedstone(RadarScanParams params);
public static class RadarScanParams {
public boolean scanMissiles = true;
public boolean scanShells = true;
public boolean scanPlayers = true;
public boolean smartMode = true;
public RadarScanParams(boolean m, boolean s, boolean p, boolean smart) {
this.scanMissiles = m;
this.scanShells = s;
this.scanPlayers = p;
this.smartMode = smart;
}
}
}

View File

@ -0,0 +1,3 @@
package api.hbm.entity;
public interface IRadiationImmune { }

View File

@ -0,0 +1,16 @@
package api.hbm.entity;
import net.minecraft.util.DamageSource;
/**
* Allows custom entities to specify threshold and resistance values based on incoming damage, type and piercing values, along with whatever other internal stats
* the entity has (like glyphid armor). Obviously only works for our own custom entities implementing this, everything else will have to work with the less powerful
* (but still very useful) entity stats in the DamageResistanceHandler.
*
* @author hbm
*/
public interface IResistanceProvider {
public float[] getCurrentDTDR(DamageSource damage, float amount, float pierceDT, float pierce);
public void onDamageDealt(DamageSource damage, float amount);
}

View File

@ -0,0 +1,66 @@
package api.hbm.entity;
import cpw.mods.fml.common.network.ByteBufUtils;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
public class RadarEntry {
/** Name use for radar display, uses I18n for lookup */
public String unlocalizedName;
/** The type of dot to show on the radar as well as the redstone level in tier mode */
public int blipLevel;
public int posX;
public int posY;
public int posZ;
public int dim;
public int entityID;
/** Whether this radar entry should be counted for the redstone output */
public boolean redstone;
public RadarEntry() { } //blank ctor for packets
public RadarEntry(String name, int level, int x, int y, int z, int dim, int entityID, boolean redstone) {
this.unlocalizedName = name;
this.blipLevel = level;
this.posX = x;
this.posY = y;
this.posZ = z;
this.dim = dim;
this.entityID = entityID;
this.redstone = redstone;
}
public RadarEntry(IRadarDetectableNT detectable, Entity entity, boolean redstone) {
this(detectable.getUnlocalizedName(), detectable.getBlipLevel(), (int) Math.floor(entity.posX), (int) Math.floor(entity.posY), (int) Math.floor(entity.posZ), entity.dimension, entity.getEntityId(), redstone);
}
public RadarEntry(IRadarDetectable detectable, Entity entity) {
this(detectable.getTargetType().name, detectable.getTargetType().ordinal(), (int) Math.floor(entity.posX), (int) Math.floor(entity.posY), (int) Math.floor(entity.posZ), entity.dimension, entity.getEntityId(), entity.motionY < 0);
}
public RadarEntry(EntityPlayer player) {
this(player.getDisplayName(), IRadarDetectableNT.PLAYER, (int) Math.floor(player.posX), (int) Math.floor(player.posY), (int) Math.floor(player.posZ), player.dimension, player.getEntityId(), true);
}
public void fromBytes(ByteBuf buf) {
this.unlocalizedName = ByteBufUtils.readUTF8String(buf);
this.blipLevel = buf.readShort();
this.posX = buf.readInt();
this.posY = buf.readInt();
this.posZ = buf.readInt();
this.dim = buf.readShort();
this.entityID = buf.readInt();
}
public void toBytes(ByteBuf buf) {
ByteBufUtils.writeUTF8String(buf, this.unlocalizedName);
buf.writeShort(this.blipLevel);
buf.writeInt(this.posX);
buf.writeInt(this.posY);
buf.writeInt(this.posZ);
buf.writeShort(this.dim);
buf.writeInt(this.entityID);
}
}

View File

@ -0,0 +1,6 @@
package api.hbm.fluid;
import api.hbm.fluidmk2.IFluidConnectorMK2;
@Deprecated
public interface IFluidConnector extends IFluidConnectorMK2 { }

View File

@ -0,0 +1,6 @@
package api.hbm.fluid;
import api.hbm.fluidmk2.IFluidConnectorBlockMK2;
@Deprecated
public interface IFluidConnectorBlock extends IFluidConnectorBlockMK2 { }

View File

@ -0,0 +1,35 @@
package api.hbm.fluid;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.uninos.GenNode;
import com.hbm.uninos.UniNodespace;
import api.hbm.fluidmk2.IFluidStandardReceiverMK2;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
@Deprecated
public interface IFluidStandardReceiver extends IFluidStandardReceiverMK2 {
public default void subscribeToAllAround(FluidType type, TileEntity tile) {
subscribeToAllAround(type, tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord);
}
public default void subscribeToAllAround(FluidType type, World world, int x, int y, int z) {
for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
trySubscribe(type, world, x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, dir);
}
}
public default void tryUnsubscribe(FluidType type, World world, int x, int y, int z) {
GenNode node = UniNodespace.getNode(world, x, y, z, type.getNetworkProvider());
if(node != null && node.net != null) node.net.removeReceiver(this);
}
public default void unsubscribeToAllAround(FluidType type, TileEntity tile) {
for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
tryUnsubscribe(type, tile.getWorldObj(), tile.xCoord + dir.offsetX, tile.yCoord + dir.offsetY, tile.zCoord + dir.offsetZ);
}
}
}

View File

@ -0,0 +1,22 @@
package api.hbm.fluid;
import com.hbm.inventory.fluid.tank.FluidTank;
import api.hbm.fluidmk2.IFluidStandardSenderMK2;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
@Deprecated
public interface IFluidStandardSender extends IFluidStandardSenderMK2 {
public default void sendFluid(FluidTank tank, World world, int x, int y, int z, ForgeDirection dir) {
tryProvide(tank, world, x, y, z, dir);
}
public default void sendFluidToAll(FluidTank tank, TileEntity tile) {
for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
tryProvide(tank, tile.getWorldObj(), tile.xCoord + dir.offsetX, tile.yCoord + dir.offsetY, tile.zCoord + dir.offsetZ, dir);
}
}
}

View File

@ -0,0 +1,4 @@
package api.hbm.fluid;
@Deprecated
public interface IFluidStandardTransceiver extends IFluidStandardReceiver, IFluidStandardSender { }

View File

@ -0,0 +1,152 @@
package api.hbm.fluidmk2;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map.Entry;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.uninos.NodeNet;
import com.hbm.util.Tuple.Pair;
import api.hbm.energymk2.IEnergyReceiverMK2.ConnectionPriority;
public class FluidNetMK2 extends NodeNet<IFluidReceiverMK2, IFluidProviderMK2, FluidNode> {
public long fluidTracker = 0L;
protected static int timeout = 3_000;
protected static long currentTime = 0;
protected FluidType type;
public FluidNetMK2(FluidType type) {
this.type = type;
for(int i = 0; i < IFluidUserMK2.HIGHEST_VALID_PRESSURE + 1; i++) providers[i] = new ArrayList();
for(int i = 0; i < IFluidUserMK2.HIGHEST_VALID_PRESSURE + 1; i++) for(int j = 0; j < ConnectionPriority.values().length; j++) receivers[i][j] = new ArrayList();
}
@Override public void resetTrackers() { this.fluidTracker = 0; }
@Override
public void update() {
if(providerEntries.isEmpty()) return;
if(receiverEntries.isEmpty()) return;
currentTime = System.currentTimeMillis();
setupFluidProviders();
setupFluidReceivers();
transferFluid();
cleanUp();
}
//this sucks ass, but it makes the code just a smidge more structured
public long[] fluidAvailable = new long[IFluidUserMK2.HIGHEST_VALID_PRESSURE + 1];
public List<Pair<IFluidProviderMK2, Long>>[] providers = new ArrayList[IFluidUserMK2.HIGHEST_VALID_PRESSURE + 1];
public long[][] fluidDemand = new long[IFluidUserMK2.HIGHEST_VALID_PRESSURE + 1][ConnectionPriority.values().length];
public List<Pair<IFluidReceiverMK2, Long>>[][] receivers = new ArrayList[IFluidUserMK2.HIGHEST_VALID_PRESSURE + 1][ConnectionPriority.values().length];
public long[] transfered = new long[IFluidUserMK2.HIGHEST_VALID_PRESSURE + 1];
public void setupFluidProviders() {
Iterator<Entry<IFluidProviderMK2, Long>> iterator = providerEntries.entrySet().iterator();
while(iterator.hasNext()) {
Entry<IFluidProviderMK2, Long> entry = iterator.next();
if(currentTime - entry.getValue() > timeout || isBadLink(entry.getKey())) { iterator.remove(); continue; }
IFluidProviderMK2 provider = entry.getKey();
int[] pressureRange = provider.getProvidingPressureRange(type);
for(int p = pressureRange[0]; p <= pressureRange[1]; p++) {
long available = Math.min(provider.getFluidAvailable(type, p), provider.getProviderSpeed(type, p));
providers[p].add(new Pair(provider, available));
fluidAvailable[p] += available;
}
}
}
public void setupFluidReceivers() {
Iterator<Entry<IFluidReceiverMK2, Long>> iterator = receiverEntries.entrySet().iterator();
while(iterator.hasNext()) {
Entry<IFluidReceiverMK2, Long> entry = iterator.next();
if(currentTime - entry.getValue() > timeout || isBadLink(entry.getKey())) { iterator.remove(); continue; }
IFluidReceiverMK2 receiver = entry.getKey();
int[] pressureRange = receiver.getReceivingPressureRange(type);
for(int p = pressureRange[0]; p <= pressureRange[1]; p++) {
long required = Math.min(receiver.getDemand(type, p), receiver.getReceiverSpeed(type, p));
int priority = receiver.getFluidPriority().ordinal();
receivers[p][priority].add(new Pair(receiver, required));
fluidDemand[p][priority] += required;
}
}
}
public void transferFluid() {
long[] received = new long[IFluidUserMK2.HIGHEST_VALID_PRESSURE + 1];
long[] notAccountedFor = new long[IFluidUserMK2.HIGHEST_VALID_PRESSURE + 1];
for(int p = 0; p <= IFluidUserMK2.HIGHEST_VALID_PRESSURE; p++) { // if the pressure range were ever to increase, we might have to rethink this
long totalAvailable = fluidAvailable[p];
for(int i = ConnectionPriority.values().length - 1; i >= 0; i--) {
long toTransfer = Math.min(fluidDemand[p][i], totalAvailable);
if(toTransfer <= 0) continue;
long priorityDemand = fluidDemand[p][i];
for(Pair<IFluidReceiverMK2, Long> entry : receivers[p][i]) {
double weight = (double) entry.getValue() / (double) (priorityDemand);
long toSend = (long) Math.max(toTransfer * weight, 0D);
toSend -= entry.getKey().transferFluid(type, p, toSend);
received[p] += toSend;
fluidTracker += toSend;
}
totalAvailable -= received[p];
}
notAccountedFor[p] = received[p];
}
for(int p = 0; p <= IFluidUserMK2.HIGHEST_VALID_PRESSURE; p++) {
for(Pair<IFluidProviderMK2, Long> entry : providers[p]) {
double weight = (double) entry.getValue() / (double) fluidAvailable[p];
long toUse = (long) Math.max(received[p] * weight, 0D);
entry.getKey().useUpFluid(type, p, toUse);
notAccountedFor[p] -= toUse;
}
}
for(int p = 0; p <= IFluidUserMK2.HIGHEST_VALID_PRESSURE; p++) {
int iterationsLeft = 100;
while(iterationsLeft > 0 && notAccountedFor[p] > 0 && providers[p].size() > 0) {
iterationsLeft--;
Pair<IFluidProviderMK2, Long> selected = providers[p].get(rand.nextInt(providers[p].size()));
IFluidProviderMK2 scapegoat = selected.getKey();
long toUse = Math.min(notAccountedFor[p], scapegoat.getFluidAvailable(type, p));
scapegoat.useUpFluid(type, p, toUse);
notAccountedFor[p] -= toUse;
}
}
}
public void cleanUp() {
for(int i = 0; i < IFluidUserMK2.HIGHEST_VALID_PRESSURE + 1; i++) {
fluidAvailable[i] = 0;
providers[i].clear();
transfered[i] = 0;
for(int j = 0; j < ConnectionPriority.values().length; j++) {
fluidDemand[i][j] = 0;
receivers[i][j].clear();
}
}
}
}

View File

@ -0,0 +1,19 @@
package api.hbm.fluidmk2;
import com.hbm.uninos.GenNode;
import com.hbm.uninos.INetworkProvider;
import com.hbm.util.fauxpointtwelve.BlockPos;
import com.hbm.util.fauxpointtwelve.DirPos;
public class FluidNode extends GenNode<FluidNetMK2> {
public FluidNode(INetworkProvider<FluidNetMK2> provider, BlockPos... positions) {
super(provider, positions);
}
@Override
public FluidNode setConnections(DirPos... connections) {
super.setConnections(connections);
return this;
}
}

View File

@ -0,0 +1,21 @@
package api.hbm.fluidmk2;
import com.hbm.inventory.fluid.FluidType;
import net.minecraft.item.ItemStack;
public interface IFillableItem {
/** Whether this stack can be filled with this type. Not particularly useful for normal operations */
public boolean acceptsFluid(FluidType type, ItemStack stack);
/** Tries to fill the stack, returns the remainder that couldn't be added */
public int tryFill(FluidType type, int amount, ItemStack stack);
/** Whether this stack can fill tiles with this type. Not particularly useful for normal operations */
public boolean providesFluid(FluidType type, ItemStack stack);
/** Provides fluid with the maximum being the requested amount */
public int tryEmpty(FluidType type, int amount, ItemStack stack);
/** Returns the first (or only) corrently held type, may return null. Currently only used for setting bedrock ores */
public FluidType getFirstFluidType(ItemStack stack);
/** Returns the fillstate for the specified fluid. Currently only used for setting bedrock ores */
public int getFill(ItemStack stack);
}

View File

@ -0,0 +1,12 @@
package api.hbm.fluidmk2;
import com.hbm.inventory.fluid.FluidType;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.util.ForgeDirection;
public interface IFluidConnectorBlockMK2 {
/** dir is the face that is connected to, the direction going outwards from the block */
public boolean canConnect(FluidType type, IBlockAccess world, int x, int y, int z, ForgeDirection dir);
}

View File

@ -0,0 +1,17 @@
package api.hbm.fluidmk2;
import com.hbm.inventory.fluid.FluidType;
import net.minecraftforge.common.util.ForgeDirection;
public interface IFluidConnectorMK2 {
/**
* Whether the given side can be connected to
* @param dir
* @return
*/
public default boolean canConnect(FluidType type, ForgeDirection dir) {
return dir != ForgeDirection.UNKNOWN;
}
}

View File

@ -0,0 +1,27 @@
package api.hbm.fluidmk2;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.lib.Library;
import com.hbm.util.fauxpointtwelve.BlockPos;
import com.hbm.util.fauxpointtwelve.DirPos;
import net.minecraft.tileentity.TileEntity;
/**
* IFluidConductorMK2 with added node creation method
* @author hbm
*/
public interface IFluidPipeMK2 extends IFluidConnectorMK2 {
public default FluidNode createNode(FluidType type) {
TileEntity tile = (TileEntity) this;
return new FluidNode(type.getNetworkProvider(), new BlockPos(tile.xCoord, tile.yCoord, tile.zCoord)).setConnections(
new DirPos(tile.xCoord + 1, tile.yCoord, tile.zCoord, Library.POS_X),
new DirPos(tile.xCoord - 1, tile.yCoord, tile.zCoord, Library.NEG_X),
new DirPos(tile.xCoord, tile.yCoord + 1, tile.zCoord, Library.POS_Y),
new DirPos(tile.xCoord, tile.yCoord - 1, tile.zCoord, Library.NEG_Y),
new DirPos(tile.xCoord, tile.yCoord, tile.zCoord + 1, Library.POS_Z),
new DirPos(tile.xCoord, tile.yCoord, tile.zCoord - 1, Library.NEG_Z)
);
}
}

View File

@ -0,0 +1,12 @@
package api.hbm.fluidmk2;
import com.hbm.inventory.fluid.FluidType;
public interface IFluidProviderMK2 extends IFluidUserMK2 {
public void useUpFluid(FluidType type, int pressure, long amount);
public default long getProviderSpeed(FluidType type, int pressure) { return 1_000_000_000; }
public long getFluidAvailable(FluidType type, int pressure);
public default int[] getProvidingPressureRange(FluidType type) { return DEFAULT_PRESSURE_RANGE; }
}

View File

@ -0,0 +1,63 @@
package api.hbm.fluidmk2;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.packet.PacketDispatcher;
import com.hbm.packet.toclient.AuxParticlePacketNT;
import com.hbm.uninos.GenNode;
import com.hbm.uninos.UniNodespace;
import com.hbm.util.fauxpointtwelve.DirPos;
import api.hbm.energymk2.IEnergyReceiverMK2.ConnectionPriority;
import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
public interface IFluidReceiverMK2 extends IFluidUserMK2 {
/** Sends fluid of the desired type and pressure to the receiver, returns the remainder */
public long transferFluid(FluidType type, int pressure, long amount);
public default long getReceiverSpeed(FluidType type, int pressure) { return 1_000_000_000; }
public long getDemand(FluidType type, int pressure);
public default int[] getReceivingPressureRange(FluidType type) { return DEFAULT_PRESSURE_RANGE; }
public default void trySubscribe(FluidType type, World world, DirPos pos) { trySubscribe(type, world, pos.getX(), pos.getY(), pos.getZ(), pos.getDir()); }
public default void trySubscribe(FluidType type, World world, int x, int y, int z, ForgeDirection dir) {
TileEntity te = TileAccessCache.getTileOrCache(world, x, y, z);
boolean red = false;
if(te instanceof IFluidConnectorMK2) {
IFluidConnectorMK2 con = (IFluidConnectorMK2) te;
if(!con.canConnect(type, dir.getOpposite())) return;
GenNode node = UniNodespace.getNode(world, x, y, z, type.getNetworkProvider());
if(node != null && node.net != null) {
node.net.addReceiver(this);
red = true;
}
}
if(particleDebug) {
NBTTagCompound data = new NBTTagCompound();
data.setString("type", "network");
data.setString("mode", "fluid");
data.setInteger("color", type.getColor());
double posX = x + 0.5 + dir.offsetX * 0.5 + world.rand.nextDouble() * 0.5 - 0.25;
double posY = y + 0.5 + dir.offsetY * 0.5 + world.rand.nextDouble() * 0.5 - 0.25;
double posZ = z + 0.5 + dir.offsetZ * 0.5 + world.rand.nextDouble() * 0.5 - 0.25;
data.setDouble("mX", -dir.offsetX * (red ? 0.025 : 0.1));
data.setDouble("mY", -dir.offsetY * (red ? 0.025 : 0.1));
data.setDouble("mZ", -dir.offsetZ * (red ? 0.025 : 0.1));
PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, posX, posY, posZ), new TargetPoint(world.provider.dimensionId, posX, posY, posZ, 25));
}
}
public default ConnectionPriority getFluidPriority() {
return ConnectionPriority.NORMAL;
}
}

View File

@ -0,0 +1,9 @@
package api.hbm.fluidmk2;
public interface IFluidRegisterListener {
/**
* Called when the fluid registry initializes all fluids. Use CompatFluidRegistry to create new instances of FluidType, which are automatically registered.
*/
public void onFluidsLoad();
}

View File

@ -0,0 +1,68 @@
package api.hbm.fluidmk2;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.tank.FluidTank;
/**
* IFluidReceiverMK2 with standard implementation for transfer and demand getter.
* @author hbm
*/
public interface IFluidStandardReceiverMK2 extends IFluidReceiverMK2 {
public FluidTank[] getReceivingTanks();
@Override
public default long getDemand(FluidType type, int pressure) {
long amount = 0;
for(FluidTank tank : getReceivingTanks()) {
if(tank.getTankType() == type && tank.getPressure() == pressure) amount += (tank.getMaxFill() - tank.getFill());
}
return amount;
}
@Override
public default long transferFluid(FluidType type, int pressure, long amount) {
int tanks = 0;
for(FluidTank tank : getReceivingTanks()) {
if(tank.getTankType() == type && tank.getPressure() == pressure) tanks++;
}
if(tanks > 1) {
int firstRound = (int) Math.floor((double) amount / (double) tanks);
for(FluidTank tank : getReceivingTanks()) {
if(tank.getTankType() == type && tank.getPressure() == pressure) {
int toAdd = Math.min(firstRound, tank.getMaxFill() - tank.getFill());
tank.setFill(tank.getFill() + toAdd);
amount -= toAdd;
}
}
}
if(amount > 0) for(FluidTank tank : getReceivingTanks()) {
if(tank.getTankType() == type && tank.getPressure() == pressure) {
int toAdd = (int) Math.min(amount, tank.getMaxFill() - tank.getFill());
tank.setFill(tank.getFill() + toAdd);
amount -= toAdd;
}
}
return amount;
}
@Override
public default int[] getReceivingPressureRange(FluidType type) {
int lowest = HIGHEST_VALID_PRESSURE;
int highest = 0;
for(FluidTank tank : getReceivingTanks()) {
if(tank.getTankType() == type) {
if(tank.getPressure() < lowest) lowest = tank.getPressure();
if(tank.getPressure() > highest) highest = tank.getPressure();
}
}
return lowest <= highest ? new int[] {lowest, highest} : DEFAULT_PRESSURE_RANGE;
}
@Override
public default long getReceiverSpeed(FluidType type, int pressure) {
return 1_000_000_000;
}
}

View File

@ -0,0 +1,129 @@
package api.hbm.fluidmk2;
import com.hbm.inventory.fluid.tank.FluidTank;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.packet.PacketDispatcher;
import com.hbm.packet.toclient.AuxParticlePacketNT;
import com.hbm.uninos.GenNode;
import com.hbm.uninos.UniNodespace;
import com.hbm.util.fauxpointtwelve.DirPos;
import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
/**
* IFluidProviderMK2 with standard implementation for fluid provision and fluid removal.
* @author hbm
*/
public interface IFluidStandardSenderMK2 extends IFluidProviderMK2 {
public default void tryProvide(FluidTank tank, World world, DirPos pos) { tryProvide(tank.getTankType(), tank.getPressure(), world, pos.getX(), pos.getY(), pos.getZ(), pos.getDir()); }
public default void tryProvide(FluidType type, World world, DirPos pos) { tryProvide(type, 0, world, pos.getX(), pos.getY(), pos.getZ(), pos.getDir()); }
public default void tryProvide(FluidType type, int pressure, World world, DirPos pos) { tryProvide(type, pressure, world, pos.getX(), pos.getY(), pos.getZ(), pos.getDir()); }
public default void tryProvide(FluidTank tank, World world, int x, int y, int z, ForgeDirection dir) { tryProvide(tank.getTankType(), tank.getPressure(), world, x, y, z, dir); }
public default void tryProvide(FluidType type, World world, int x, int y, int z, ForgeDirection dir) { tryProvide(type, 0, world, x, y, z, dir); }
public default void tryProvide(FluidType type, int pressure, World world, int x, int y, int z, ForgeDirection dir) {
TileEntity te = TileAccessCache.getTileOrCache(world, x, y, z);
boolean red = false;
if(te instanceof IFluidConnectorMK2) {
IFluidConnectorMK2 con = (IFluidConnectorMK2) te;
if(con.canConnect(type, dir.getOpposite())) {
GenNode<FluidNetMK2> node = UniNodespace.getNode(world, x, y, z, type.getNetworkProvider());
if(node != null && node.net != null) {
node.net.addProvider(this);
red = true;
}
}
}
if(te != this && te instanceof IFluidReceiverMK2) {
IFluidReceiverMK2 rec = (IFluidReceiverMK2) te;
if(rec.canConnect(type, dir.getOpposite())) {
long provides = Math.min(this.getFluidAvailable(type, pressure), this.getProviderSpeed(type, pressure));
long receives = Math.min(rec.getDemand(type, pressure), rec.getReceiverSpeed(type, pressure));
long toTransfer = Math.min(provides, receives);
toTransfer -= rec.transferFluid(type, pressure, toTransfer);
this.useUpFluid(type, pressure, toTransfer);
}
}
if(particleDebug) {
NBTTagCompound data = new NBTTagCompound();
data.setString("type", "network");
data.setString("mode", "fluid");
data.setInteger("color", type.getColor());
double posX = x + 0.5 - dir.offsetX * 0.5 + world.rand.nextDouble() * 0.5 - 0.25;
double posY = y + 0.5 - dir.offsetY * 0.5 + world.rand.nextDouble() * 0.5 - 0.25;
double posZ = z + 0.5 - dir.offsetZ * 0.5 + world.rand.nextDouble() * 0.5 - 0.25;
data.setDouble("mX", dir.offsetX * (red ? 0.025 : 0.1));
data.setDouble("mY", dir.offsetY * (red ? 0.025 : 0.1));
data.setDouble("mZ", dir.offsetZ * (red ? 0.025 : 0.1));
PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, posX, posY, posZ), new TargetPoint(world.provider.dimensionId, posX, posY, posZ, 25));
}
}
public FluidTank[] getSendingTanks();
@Override
public default long getFluidAvailable(FluidType type, int pressure) {
long amount = 0;
for(FluidTank tank : getSendingTanks()) {
if(tank.getTankType() == type && tank.getPressure() == pressure) amount += tank.getFill();
}
return amount;
}
@Override
public default void useUpFluid(FluidType type, int pressure, long amount) {
int tanks = 0;
for(FluidTank tank : getSendingTanks()) {
if(tank.getTankType() == type && tank.getPressure() == pressure) tanks++;
}
if(tanks > 1) {
int firstRound = (int) Math.floor((double) amount / (double) tanks);
for(FluidTank tank : getSendingTanks()) {
if(tank.getTankType() == type && tank.getPressure() == pressure) {
int toRem = Math.min(firstRound, tank.getFill());
tank.setFill(tank.getFill() - toRem);
amount -= toRem;
}
}
}
if(amount > 0) for(FluidTank tank : getSendingTanks()) {
if(tank.getTankType() == type && tank.getPressure() == pressure) {
int toRem = (int) Math.min(amount, tank.getFill());
tank.setFill(tank.getFill() - toRem);
amount -= toRem;
}
}
}
@Override
public default int[] getProvidingPressureRange(FluidType type) {
int lowest = HIGHEST_VALID_PRESSURE;
int highest = 0;
for(FluidTank tank : getSendingTanks()) {
if(tank.getTankType() == type) {
if(tank.getPressure() < lowest) lowest = tank.getPressure();
if(tank.getPressure() > highest) highest = tank.getPressure();
}
}
return lowest <= highest ? new int[] {lowest, highest} : DEFAULT_PRESSURE_RANGE;
}
@Override
public default long getProviderSpeed(FluidType type, int pressure) {
return 1_000_000_000;
}
}

View File

@ -0,0 +1,5 @@
package api.hbm.fluidmk2;
public interface IFluidStandardTransceiverMK2 extends IFluidStandardReceiverMK2, IFluidStandardSenderMK2 {
}

View File

@ -0,0 +1,15 @@
package api.hbm.fluidmk2;
import com.hbm.inventory.fluid.tank.FluidTank;
import api.hbm.tile.ILoadedTile;
public interface IFluidUserMK2 extends IFluidConnectorMK2, ILoadedTile {
public static final int HIGHEST_VALID_PRESSURE = 5;
public static final int[] DEFAULT_PRESSURE_RANGE = new int[] {0, 0};
public static final boolean particleDebug = false;
public FluidTank[] getAllTanks();
}

View File

@ -0,0 +1,24 @@
package api.hbm.fluidmk2;
/*
It's rather shrimple: the shiny new energy system using universal nodespace, but hit with a hammer until it works with fluids.
Has a few extra bits and pieces for handling, but the concept is basically the same.
Sounds good?
*/
/*
Quick explanation for implementing new fluids via addon:
Fluids are subject to /ntmreload so they get wiped and rebuilt using the init function in Fluids, which means that if fluids
are simply added externally during startup, they are removed permanently until the game restarts. Same concept as with recipes, really.
To fix this we need to make sure that externally registered fluids are re-registered during reload, for that purpose we have
IFluidRegisterListener, a simple interface with a small method that runs whenever the fluid list is reloaded. IFluidRegisterListeners
need to be registered with CompatExternal.registerFluidRegisterListener to be used, make sure to do this during PreInit.
Inside the IFluidRegisterListener, fluids can be added using CompatFluidRegistry.registerFluid, which will generate a Fluid instance
using the supplied arguments and automatically register it. Do note that like with custom fluids, fluids need numeric IDs assigned manually.
To prevent collisions with stock fluids when NTM updates, make sure to choose a high starting ID (e.g. 10,000).
The fluid created by registerFluid can have traits added to them, just like how NTM does it with its stock fluids.
*/

View File

@ -0,0 +1,22 @@
package api.hbm.item;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
public interface IDepthRockTool {
/**
* Whether our item can break depthrock, has a couple of params so we can restrict mining for certain blocks, dimensions or positions
* @param world
* @param player
* @param tool
* @param block
* @param x
* @param y
* @param z
* @return
*/
public boolean canBreakRock(World world, EntityPlayer player, ItemStack tool, Block block, int x, int y, int z);
}

View File

@ -0,0 +1,30 @@
package api.hbm.item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
public interface IDesignatorItem {
/**
* Whether the target is valid
* @param world for things like restricting dimensions or getting entities
* @param stack to check NBT and metadata
* @param x position of the launch pad
* @param y position of the launch pad
* @param z position of the launch pad
* @return
*/
public boolean isReady(World world, ItemStack stack, int x, int y, int z);
/**
* The target position if the designator is ready
* @param world
* @param stack
* @param x
* @param y
* @param z
* @return the target
*/
public Vec3 getCoords(World world, ItemStack stack, int x, int y, int z);
}

View File

@ -0,0 +1,52 @@
package api.hbm.item;
import java.util.ArrayList;
import com.hbm.util.ArmorRegistry.HazardClass;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
public interface IGasMask {
/**
* Returns a list of HazardClasses which can not be protected against by this mask (e.g. chlorine gas for half masks)
* @param stack
* @param entity
* @return an empty list if there's no blacklist
*/
public ArrayList<HazardClass> getBlacklist(ItemStack stack, EntityLivingBase entity);
/**
* Returns the loaded filter, if there is any
* @param stack
* @param entity
* @return null if no filter is installed
*/
public ItemStack getFilter(ItemStack stack, EntityLivingBase entity);
/**
* Checks whether the provided filter can be screwed into the mask, does not take already applied filters into account (those get ejected)
* @param stack
* @param entity
* @param filter
* @return
*/
public boolean isFilterApplicable(ItemStack stack, EntityLivingBase entity, ItemStack filter);
/**
* This will write the filter to the stack's NBT, it ignores any previously installed filter and won't eject those
* @param stack
* @param entity
* @param filter
*/
public void installFilter(ItemStack stack, EntityLivingBase entity, ItemStack filter);
/**
* Damages the installed filter, if there is one
* @param stack
* @param entity
* @param damage
*/
public void damageFilter(ItemStack stack, EntityLivingBase entity, int damage);
}

View File

@ -0,0 +1,31 @@
package api.hbm.item;
import java.util.List;
import com.hbm.util.Tuple.Pair;
import com.hbm.util.Tuple.Triplet;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
public interface IGunHUDProvider {
/**
* Gets the progress for the status bar right of the toolbar. Usually reserved for durability.
* It's now a list! More bars for stuff like overheating and special charges!
* @param stack
* @param player
* @return a list of triplets holding progress, foreground and background color.
*/
public List<Triplet<Double, Integer, Integer>> getStatusBars(ItemStack stack, EntityPlayer player);
/**
* Gets a list of any size containing a preview icon for loaded ammo as well as text indicating the ammo count.
* Can also be used for any kind of tooltip or maybe a built-in compass of sorts.
* @param stack
* @param player
* @return
*/
public List<Pair<IIcon, String>> getAmmoInfo(ItemStack stack, EntityPlayer player);
}

View File

@ -0,0 +1,6 @@
package api.hbm.ntl;
public enum EnumStorageType {
CLUTTER, //potentially unsorted storage (like crates) with many slots that have low capacity
MASS //storage with very few lots (usually 1) and very high capacity
}

View File

@ -0,0 +1,29 @@
package api.hbm.ntl;
import net.minecraft.item.ItemStack;
public interface IStorageComponent {
/**
* @return The type of storage this tile entity represents.
*/
public EnumStorageType getType();
/**
* @return A StorageManifest instance containing all managed stacks
*/
public StorageManifest getManifest();
/**
* @return An integer representing the version of the manifest. The higher the numberm, the more recent the manifest
* (i.e. always count up), the version has to change every time the manifest updates.
*/
public int getManifestVersion();
/**
* @param stack The stack to be stored
* @param simulate Whether the changes should actually be written or if the operation is only for checking
* @return The remainder of the stack after being stored, null if nothing remains
*/
public ItemStack storeStack(ItemStack stack, boolean simulate);
}

View File

@ -0,0 +1,68 @@
package api.hbm.ntl;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map.Entry;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
public class StorageManifest {
public HashMap<Integer, MetaNode> itemMeta = new HashMap();
public void writeStack(ItemStack stack) {
int id = Item.getIdFromItem(stack.getItem());
MetaNode meta = itemMeta.get(id);
if(meta == null) {
meta = new MetaNode();
itemMeta.put(id, meta);
}
NBTNode nbt = meta.metaNBT.get(stack.getItemDamage());
if(nbt == null) {
nbt = new NBTNode();
meta.metaNBT.put(stack.getItemDamage(), nbt);
}
NBTTagCompound compound = stack.hasTagCompound() ? (NBTTagCompound) stack.stackTagCompound.copy() : null;
long amount = nbt.nbtAmount.containsKey(compound) ? nbt.nbtAmount.get(compound) : 0;
amount += stack.stackSize;
nbt.nbtAmount.put(compound, amount);
}
public List<StorageStack> getStacks() {
List<StorageStack> stacks = new ArrayList();
for(Entry<Integer, MetaNode> itemNode : itemMeta.entrySet()) {
for(Entry<Integer, NBTNode> metaNode : itemNode.getValue().metaNBT.entrySet()) {
for(Entry<NBTTagCompound, Long> nbtNode : metaNode.getValue().nbtAmount.entrySet()) {
ItemStack itemStack = new ItemStack(Item.getItemById(itemNode.getKey()), 1, metaNode.getKey());
itemStack.stackTagCompound = nbtNode.getKey();
StorageStack stack = new StorageStack(itemStack, nbtNode.getValue());
stacks.add(stack);
}
}
}
return stacks;
}
public class MetaNode {
public HashMap<Integer, NBTNode> metaNBT = new HashMap();
}
public class NBTNode {
public HashMap<NBTTagCompound, Long> nbtAmount = new HashMap();
}
}

View File

@ -0,0 +1,27 @@
package api.hbm.ntl;
import net.minecraft.item.ItemStack;
public class StorageStack {
private ItemStack type;
private long amount;
public StorageStack(ItemStack type) {
this(type, type.stackSize);
}
public StorageStack(ItemStack type, long amount) {
this.type = type.copy();
this.amount = amount;
this.type.stackSize = 0;
}
public ItemStack getType() {
return this.type.copy();
}
public long getAmount() {
return this.amount;
}
}

View File

@ -0,0 +1,13 @@
package api.hbm.recipe;
public interface IRecipeRegisterListener {
/**
* Called during SerializableRecipe.initialize(), after the defaults are loaded but before the template is written.
* Due to the way the recipes are handled, calling it once is not enough, it has to be called once for every SerializableRecipe
* instance handled, therefore the load operation passes the type name of the recipe, so that the listeners know what type of recipe
* to register at that point. Note that the actual SerializableRecipe instance is irrelevant, since recipes are static anyway,
* and direct tampering with SerializableRecipes is not recommended.
*/
public void onRecipeLoad(String recipeClassName);
}

View File

@ -0,0 +1,17 @@
package api.hbm.recipe;
/*
Quick guide on how to make robust and safe recipe integration:
* Implement IRecipeRegisterListener, the resulting class will handle all recipes, and the onRecipeLoad method is called every time the SerializableRecipe system updates
* Register your IRecipeRegisterListener using CompatExternal.registerRecipeRegisterListener, this has to happen before the SerializableRecipe initializes, doing this during PreInit should be safe
* In your IRecipeRegisterListener, check the supplied recipe type string (which will be the class name of the SerializableRecipe currently being registered) and register your custom recipes accordingly using CompatRecipeRegistry
Explanation:
* Order of operations is important for the recipes to work, if recipes are loaded outside the scope of SerializableRecipe.initialize, they will not work correctly
* If recipes are registered before the init, they are deleted, if they are registered after the init, they will not be part of the config template file, and get deleted when running /ntmreload
* Machines change all the time, so the recipe classes should not be considered API, since the compat would break immediately if a machine is changed or removed
* CompatRecipeRegistry promises to never change its method signatures, and have solid sanity checking when recipes are registered, allowing it to make the bst of whatever data is thrown at it
* Using this dedicated registry class means that even if a machine is changed or removed, the recipes will continue to work to the best of its abilities
*/

View File

@ -0,0 +1,9 @@
package api.hbm.redstoneoverradio;
public interface IRORInfo {
public static String PREFIX_VALUE = "VAL:";
public static String PREFIX_FUNCTION = "FUN:";
public String[] getFunctionInfo();
}

View File

@ -0,0 +1,41 @@
package api.hbm.redstoneoverradio;
public interface IRORInteractive extends IRORInfo {
public static String NAME_SEPARATOR = "!";
public static String PARAM_SEPARATOR = ":";
public static String EX_NULL = "Exception: Null Command";
public static String EX_NAME = "Exception: Multiple Name Separators";
public static String EX_FORMAT = "Exception: Parameter in Invalid Format";
/** Runs a function on the ROR component, usually causing the component to change or do something. Returns are optional. */
public String runRORFunction(String name, String[] params);
/** Extracts the command name from a full command string */
public static String getCommand(String input) {
if(input == null || input.isEmpty()) throw new RORFunctionException(EX_NULL);
String[] parts = input.split(NAME_SEPARATOR);
if(parts.length <= 0 || parts.length > 2) throw new RORFunctionException(EX_NAME);
if(parts[0].isEmpty()) throw new RORFunctionException(EX_NULL);
return parts[0];
}
/** Extracts the param list from a full command string */
public static String[] getParams(String input) {
if(input == null || input.isEmpty()) throw new RORFunctionException(EX_NULL);
String[] parts = input.split(NAME_SEPARATOR);
if(parts.length <= 0 || parts.length > 2) throw new RORFunctionException(EX_NAME);
if(parts.length == 1) return new String[0];
String paramList = parts[1];
String[] params = paramList.split(PARAM_SEPARATOR);
return params;
}
public static int parseInt(String val, int min, int max) {
int result = 0;
try { result = Integer.parseInt(val); } catch(Exception x) { throw new RORFunctionException(EX_FORMAT); };
if(result < min || result > max) throw new RORFunctionException(EX_FORMAT);
return result;
}
}

View File

@ -0,0 +1,7 @@
package api.hbm.redstoneoverradio;
public interface IRORValueProvider extends IRORInfo {
/** Grabs the specified value from this ROR component, operations should not cause any changes with the component itself */
public String provideRORValue(String name);
}

View File

@ -0,0 +1,8 @@
package api.hbm.redstoneoverradio;
public class RORFunctionException extends RuntimeException {
public RORFunctionException(String message) {
super(message);
}
}

View File

@ -0,0 +1,49 @@
/**
* @author hbm
*
*/
package api.hbm.redstoneoverradio;
/*
__ __ __ _________ ________ __ __ __ __ ______ __
/_/| /_/\ /_/| /________/\ /_______/| /_/| /_/| /_/|_____ /_/| /_____/| /_/|
| || | \\ | || | ___ \ \ | ______|/ | |\_| || | |/_____| || |___ || | ||
| || | \ \\ | || | || \ \/ | ||___ | \/_/ |/ | ______ || /__| || | ||__
| || | |\ \\| || | || \ || | |/__/| \ // | |/_____| || | ___|/ | |/_/|
| || | ||\ \| || | || | || | ____|/ > </\ |____ ____|/_ | |/__/| | __|/
| || | || \ | || | ||___/ |/ | ||_____ / __ \/| /_____| |______/| |______|/ | ||
| || | || \ || | |/__/ / | |/____/| | /| \ || |________________|/ | ||
|__|/ |__|/ \__|/ |_________/ |________|/ |__|/ |__|/ |__|/
(not AN index, INDEX is just the codename)
(also no i did not use an ASCII font generator i spent like half an hour on this)
INDEX includes Redstone-over-Radio APIs for interacting with ROR torches in ways more complex than simple comparator output,
simply put, certain ROR torches may run functions on the ROR component or read more complex values. This means that with the ROR
system alone, one can make complex monitoring and logic systems controlling machines via redstone automation.
INDEX includes:
- IRORInfo, an interface that provides a list of all valid functions. This interface should never be implemented directly because
it is worthless on its own, rather it is extended by all other ROR API interfaces
- IRORValueProvider, a simple interface that returns values based on names, serving as a simple getter. Get operations should never
cause changes within the ROR component, and should be kept simple
- IRORInteractive, an interface providing functions equivalent to java, usually performing a state change within the component and
optionally returning a value
On the implementation side we can expect:
- ROR readers, torches which have a list of named values which are read, as well as frequencies on which these values are broadcasted
- ROR controllers, torches which have one frequency and can receive commands with parameters which will be executed on the component
- ROR programmers, torches which have a list of frequencies and return frequencies which can receive commands with parameters and
then send the return value on the return frequency
- ROR logic receivers, torches which can turn signals into redstone based on various factors like arithmetic comparison and string
operators like matches, matches not and substring (thanks to vær for taking care of that)
ROR programmers can indeed do everything that the readers and controllers can, but their added complexity requires more GUI elements
which are more time-consuming to set up and limits the amount of command channels available, hence why readers and controllers exist
when only a simple solution is required
Addendum: While the RTTY system can support any arbitrary object as a signal, INDEX will strictly use strings, since that simplifies
things regarding serialization and saving signals to NBT. Counters already use a parse to int32 function, so this still checks out.
*/

View File

@ -0,0 +1,12 @@
package api.hbm.tile;
public interface IHeatSource {
public int getHeatStored();
/**
* Removes heat from the system. Implementation has to include the checks preventing the heat from going into the negative.
* @param heat
*/
public void useUpHeat(int heat);
}

View File

@ -0,0 +1,20 @@
package api.hbm.tile;
import net.minecraft.nbt.NBTTagCompound;
/**
* Info providers for ENERGY CONTROL
*
* For EC's implementation, refer to:
* https://github.com/Zuxelus/Energy-Control/blob/1.7.10/src/main/java/com/zuxelus/energycontrol/crossmod/CrossHBM.java
* https://github.com/Zuxelus/Energy-Control/blob/1.7.10/src/main/java/com/zuxelus/energycontrol/items/cards/ItemCardHBM.java
* https://github.com/Zuxelus/Energy-Control/blob/1.7.10/src/main/java/com/zuxelus/energycontrol/utils/DataHelper.java
*
* (keys are from DataHelper.java and CrossHBM.java)
*
* */
public interface IInfoProviderEC {
/** Adds any custom data that isn't covered by the standard energy and fluid implementations. */
public void provideExtraInfo(NBTTagCompound data);
}

View File

@ -0,0 +1,55 @@
package api.hbm.tile;
import java.util.HashMap;
import java.util.Map;
import com.hbm.util.Compat;
import com.hbm.util.Tuple.Quartet;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
/** For anything that should be removed off networks when considered unloaded, only affects providers and receivers, not links. Must not necessarily be a tile. */
public interface ILoadedTile {
public boolean isLoaded();
// should we gunk this into the API? no, but i don't care
public static class TileAccessCache {
public static Map<Quartet, TileAccessCache> cache = new HashMap();
public static int NULL_CACHE = 20;
public static int NONNULL_CACHE = 60;
public TileEntity tile;
public long expiresOn;
public TileAccessCache(TileEntity tile, long expiresOn) {
this.tile = tile;
this.expiresOn = expiresOn;
}
public boolean hasExpired(long worldTime) {
if(tile != null && tile.isInvalid()) return true;
if(worldTime >= expiresOn) return true;
if(tile instanceof ILoadedTile && !((ILoadedTile) tile).isLoaded()) return true;
return false;
}
public static Quartet publicCumRag = new Quartet(0, 0, 0, 0);
public static TileEntity getTileOrCache(World world, int x, int y, int z) {
publicCumRag.mangle(x, y, z, world.provider.dimensionId);
TileAccessCache cache = TileAccessCache.cache.get(publicCumRag);
if(cache == null || cache.hasExpired(world.getTotalWorldTime())) {
TileEntity tile = Compat.getTileStandard(world, x, y, z);
cache = new TileAccessCache(tile, world.getTotalWorldTime() + (tile == null ? NULL_CACHE : NONNULL_CACHE));
TileAccessCache.cache.put(publicCumRag.clone(), cache);
return tile;
} else {
return cache.tile;
}
}
}
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,690 +0,0 @@
# Blender v2.76 (sub 0) OBJ File: 'BalefireCrashed.blend'
# www.blender.org
o Sphere
v -0.192358 1.600254 -1.342660
v -0.385711 1.581224 -1.324975
v -0.515121 2.447250 -1.807938
v 0.002518 -3.248903 2.055765
v 0.082170 -3.153232 2.205975
v -0.260442 -2.766209 2.233894
v 0.147114 2.008001 -0.702470
v 0.215449 1.926895 -0.866215
v 0.086039 2.792921 -1.349178
v -0.592517 -2.498903 1.766917
v -0.398402 -2.931915 1.973723
v 0.223221 -3.072126 2.313615
v -0.016133 -2.625729 2.420332
v 0.209324 1.831224 -1.036127
v 0.129673 1.735553 -1.186336
v 0.000262 2.601579 -1.669299
v -0.433214 -2.307561 2.067336
v -0.354920 2.062194 -0.470774
v -0.484330 2.928220 -0.953737
v -0.665308 2.874027 -1.002420
v 0.017704 2.874027 -1.185433
v -0.114686 2.928220 -1.052783
v 0.297331 -2.531864 2.504655
v 0.210847 -2.036963 2.379984
v 0.079914 2.697250 -1.519089
v 0.404200 -3.017933 2.362299
v -0.535898 2.008001 -0.519458
v -0.806360 2.792921 -1.110060
v 0.632228 -2.498903 2.474023
v 0.597553 -1.998903 2.344614
v -0.161567 2.081224 -0.488459
v 0.014724 2.062194 -0.569820
v 0.597553 -2.998903 2.344614
v -0.290977 2.947250 -0.971422
v 0.937573 -2.531864 2.333102
v -0.756601 1.831224 -0.777308
v -0.676950 1.926895 -0.627098
v 0.773844 -3.017933 2.263253
v -0.762726 1.735553 -0.947218
v -0.892136 2.601579 -1.430181
v -0.823802 2.520473 -1.593927
v 1.166879 -2.625729 2.103345
v 1.214915 -2.145350 1.916591
v -0.694392 1.654447 -1.110963
v -0.691412 2.466280 -1.726577
v 0.906234 -3.072126 2.130603
v 1.285238 -2.766209 1.819730
v -0.886012 2.697250 -1.260270
v 0.974568 -3.153232 1.966858
v -0.011379 1.654447 -1.293977
v -0.321768 2.466280 -1.825623
v 0.968443 -3.248903 1.796946
v 1.274630 -2.931916 1.525435
v 0.662393 0.773857 -0.982993
v 1.339334 -2.498903 1.249279
v -0.720955 0.503259 -1.097548
v -0.562002 1.600254 -1.243614
v 0.888792 -3.344573 1.646737
v -0.950852 1.156541 0.135484
v 1.136669 -3.097622 1.265264
v 1.180032 -2.690245 0.948859
v 0.432497 1.427138 0.250040
v 0.697277 1.318752 -0.015261
v 0.747740 -3.425679 1.539097
v 0.892360 -3.238102 1.078826
v -0.668748 1.318752 0.350765
v 0.897927 -2.852456 0.733579
v 0.380289 0.611645 -1.198273
v 0.566762 -3.479873 1.490413
v 0.578896 -3.331967 0.994504
v -0.985735 0.611646 -0.832247
v -0.306791 1.427138 0.448132
v 0.373409 -3.498903 1.508098
v 0.243999 -3.364928 1.025135
v 0.833946 1.156540 -0.342751
v 0.535970 -2.960843 0.636212
v 0.197118 -3.479872 1.589459
v 0.018332 0.503259 -1.295640
v 0.149265 -2.998903 0.671582
v -0.061346 -3.331967 1.166056
v -1.122404 0.773857 -0.504757
v 0.079915 1.465199 0.412762
v -0.203317 -2.960842 0.834304
v -0.290652 -3.238101 1.395814
v 0.821696 0.965199 -0.682573
v 0.064728 -3.425679 1.722109
v -0.368373 0.465199 -1.260270
v -0.409011 -3.097622 1.679429
v -0.604766 -2.690244 1.427095
v -1.110155 0.965199 -0.164935
v -0.003607 -3.344573 1.885854
v 0.502818 -3.364928 1.991061
v 0.950135 -2.036963 2.181892
v -0.151110 -2.145349 2.282616
v 1.351584 -2.307561 1.589101
v -0.468097 -2.852456 1.099605
v -0.140790 2.520473 -1.776940
v 0.304880 2.200599 -2.418174
v -1.530379 2.200599 -1.926418
v -1.407440 1.377875 -1.467603
v -0.981567 2.327875 0.121777
v -1.015420 2.331225 0.188618
v 0.916431 2.331225 -0.329019
v 0.853692 2.327875 -0.369979
v 0.730753 3.150599 -0.828793
v -1.104505 3.150599 -0.337037
v 0.468144 1.331224 -2.002052
v 0.338734 2.197250 -2.485015
v -1.463708 1.331224 -1.484414
v -1.593117 2.197250 -1.967377
v 0.427819 1.377875 -1.959360
v -1.144830 3.197250 -0.294344
v 0.787022 3.197250 -0.811982
v 0.640756 1.852875 -1.164669
v 0.517817 2.675599 -1.623483
v -1.317442 2.675599 -1.131727
v -1.194503 1.852875 -0.672913
v -0.612749 2.200599 -2.172296
v -0.489810 1.377875 -1.713482
v -0.186876 3.150599 -0.582915
v -0.063937 2.327875 -0.124101
v 1.214915 -2.145350 1.916591
v 0.432497 1.427138 0.250040
v 0.697277 1.318752 -0.015261
v 0.950135 -2.036963 2.181892
vt 0.519290 0.058179
vt 0.519290 0.044033
vt 0.591799 0.044033
vt 0.073830 0.171353
vt 0.073830 0.157208
vt 0.111004 0.152030
vt 0.519289 0.199636
vt 0.519289 0.185490
vt 0.591797 0.185490
vt 0.148490 0.178426
vt 0.111004 0.176531
vt 0.073830 0.143062
vt 0.073830 0.128916
vt 0.111004 0.123738
vt 0.519290 0.143053
vt 0.519290 0.128907
vt 0.591799 0.128907
vt 0.148490 0.150135
vt 0.111004 0.148240
vt 0.519281 0.100625
vt 0.591789 0.100625
vt 0.591789 0.114770
vt 0.519269 0.270370
vt 0.591778 0.270370
vt 0.591778 0.284515
vt 0.111004 0.119948
vt 0.111004 0.095447
vt 0.148490 0.093552
vt 0.519289 0.157199
vt 0.591798 0.157199
vt 0.591798 0.171345
vt 0.073830 0.114771
vt 0.073830 0.100625
vt 0.591790 0.143062
vt 0.111004 0.091657
vt 0.111004 0.067156
vt 0.148490 0.065261
vt 0.073830 0.086479
vt 0.073830 0.072333
vt 0.519280 0.086479
vt 0.519280 0.072334
vt 0.591788 0.072334
vt 0.111004 0.063365
vt 0.111004 0.038864
vt 0.519282 0.171354
vt 0.073830 0.058188
vt 0.073830 0.044042
vt 0.519281 0.213791
vt 0.591790 0.213791
vt 0.591790 0.227937
vt 0.110996 0.289698
vt 0.110996 0.265197
vt 0.148481 0.263302
vt 0.519280 0.242082
vt 0.591788 0.242082
vt 0.591788 0.256228
vt 0.073822 0.284520
vt 0.073822 0.270375
vt 0.148498 0.206708
vt 0.111013 0.204813
vt 0.111013 0.180312
vt 0.591790 0.199645
vt 0.073839 0.199635
vt 0.073839 0.185490
vt 0.867947 0.185572
vt 0.852531 0.208643
vt 0.802245 0.198641
vt 0.073838 0.171344
vt 0.438531 0.121834
vt 0.438523 0.263301
vt 0.519281 0.284519
vt 0.438523 0.150135
vt 0.148498 0.121834
vt 0.438511 0.291588
vt 0.148498 0.093543
vt 0.438531 0.093543
vt 0.111013 0.067147
vt 0.438523 0.235009
vt 0.111013 0.091648
vt 0.438523 0.093552
vt 0.519281 0.114770
vt 0.438531 0.206709
vt 0.438531 0.178417
vt 0.438531 0.065252
vt 0.148489 0.291592
vt 0.519281 0.227937
vt 0.111004 0.261405
vt 0.111004 0.236904
vt 0.519289 0.171345
vt 0.073830 0.256227
vt 0.073830 0.242082
vt 0.438531 0.036960
vt 0.111004 0.233114
vt 0.111004 0.208613
vt 0.073830 0.227936
vt 0.073830 0.213790
vt 0.036969 0.164280
vt 0.036969 0.135989
vt 0.036969 0.107698
vt 0.036969 0.079406
vt 0.036970 0.051115
vt 0.148490 0.036969
vt 0.036961 0.277447
vt 0.036978 0.192562
vt 0.036969 0.249154
vt 0.036969 0.220863
vt 0.148490 0.235009
vt 0.192327 0.347853
vt 0.192327 0.485619
vt 0.123444 0.485619
vt 0.699469 0.172501
vt 0.699469 0.034735
vt 0.768352 0.034735
vt 0.443577 0.396280
vt 0.584968 0.400334
vt 0.439951 0.400334
vt 0.581343 0.396280
vt 0.443577 0.327397
vt 0.581343 0.327397
vt 0.319721 0.480769
vt 0.319721 0.335752
vt 0.392229 0.335752
vt 0.695415 0.176127
vt 0.622907 0.031110
vt 0.695416 0.031110
vt 0.903489 0.115635
vt 0.964650 0.186331
vt 0.903489 0.188144
vt 0.866342 0.040735
vt 0.866342 0.109618
vt 0.805181 0.111431
vt 0.712656 0.540579
vt 0.651495 0.469883
vt 0.712656 0.468071
vt 0.781166 0.340069
vt 0.781166 0.271186
vt 0.842327 0.269373
vt 0.622907 0.176127
vt 0.618854 0.172502
vt 0.443577 0.476895
vt 0.439951 0.472842
vt 0.584968 0.472842
vt 0.396282 0.477144
vt 0.392229 0.480769
vt 0.315668 0.339377
vt 0.315667 0.477144
vt 0.246785 0.339377
vt 0.876104 0.584646
vt 0.877917 0.552017
vt 0.946800 0.552017
vt 0.558888 0.554541
vt 0.490005 0.554541
vt 0.488192 0.521912
vt 0.971580 0.044744
vt 0.900884 0.077373
vt 0.902697 0.044744
vt 0.927650 0.489798
vt 0.925837 0.522427
vt 0.856954 0.522427
vt 0.835610 0.458829
vt 0.933025 0.389946
vt 0.933025 0.458829
vt 0.724805 0.327967
vt 0.724805 0.425382
vt 0.655922 0.425382
vt 0.636432 0.274081
vt 0.636432 0.205198
vt 0.733848 0.205198
vt 0.957268 0.244504
vt 0.957268 0.341919
vt 0.888385 0.341919
vt 0.042829 0.347853
vt 0.046882 0.344228
vt 0.046882 0.489245
vt 0.119390 0.344228
vt 0.119390 0.489245
vt 0.591799 0.058179
vt 0.591788 0.086479
vt 0.591790 0.171354
vt 0.519280 0.256228
vt 0.796832 0.185572
vt 0.796832 0.171427
vt 0.802245 0.158358
vt 0.812247 0.148355
vt 0.825316 0.142942
vt 0.839462 0.142942
vt 0.852531 0.148355
vt 0.862533 0.158357
vt 0.867947 0.171426
vt 0.862534 0.198641
vt 0.839462 0.214057
vt 0.825317 0.214057
vt 0.812248 0.208644
vt 0.123444 0.347853
vt 0.768352 0.172501
vt 0.964650 0.117448
vt 0.805181 0.038922
vt 0.651495 0.538767
vt 0.842327 0.341882
vt 0.618854 0.034735
vt 0.581343 0.476896
vt 0.396282 0.339378
vt 0.246784 0.477143
vt 0.948613 0.584646
vt 0.560701 0.521912
vt 0.973392 0.077373
vt 0.855141 0.489798
vt 0.835610 0.389946
vt 0.655922 0.327967
vt 0.733848 0.274081
vt 0.888385 0.244504
vt 0.042829 0.485620
vt 0.021699 0.793428
vt 0.021698 0.699267
vt 0.986999 0.699267
vt 0.986999 0.793427
vn -0.031400 -0.490400 -0.870900
vn -0.554500 -0.536800 0.635900
vn 0.927700 0.277800 0.249500
vn -0.841100 -0.125800 0.526100
vn -0.393900 -0.408100 0.823600
vn 0.903600 -0.097500 -0.417000
vn -0.623400 0.048500 0.780400
vn -0.350300 0.415700 0.839300
vn 0.723000 0.415700 0.551700
vn -0.305900 0.182000 0.934500
vn 0.991100 0.097500 -0.090700
vn -0.159500 -0.309600 0.937400
vn -0.678600 0.277800 0.679900
vn 0.063300 0.254200 0.965100
vn 0.408300 0.490400 0.770000
vn 0.113000 -0.256300 0.960000
vn 0.031400 0.490400 0.870900
vn 0.427800 0.254200 0.867400
vn -0.903600 0.097500 0.417000
vn 0.382100 -0.256300 0.887900
vn -0.927700 -0.277800 -0.249500
vn 0.732200 0.182000 0.656400
vn -0.723000 -0.415700 -0.551700
vn 0.606800 -0.309600 0.732100
vn 0.930100 0.048500 0.364100
vn -0.991100 -0.097500 0.090600
vn 0.752900 -0.408100 0.516300
vn 0.350300 -0.415700 -0.839300
vn -0.129400 0.866000 -0.483000
vn 0.798200 -0.536800 0.273500
vn 0.754400 0.293700 -0.587100
vn 0.991400 -0.125800 0.035100
vn -0.423600 -0.059000 -0.903900
vn 0.735700 -0.676000 0.040400
vn -0.868300 0.468900 0.161800
vn 0.906900 -0.314500 -0.280600
vn 0.592200 0.754600 0.282700
vn 0.575100 -0.804700 -0.147300
vn -0.666300 0.630700 0.397800
vn 0.689200 -0.488800 -0.534900
vn 0.552300 0.131900 -0.823100
vn 0.340700 -0.903200 -0.261000
vn -0.706100 0.008000 -0.708000
vn 0.371700 -0.622200 -0.689000
vn -0.371500 0.754600 0.540900
vn 0.068200 -0.956500 -0.283600
vn 0.775900 0.630700 0.011400
vn 0.002500 -0.694400 -0.719600
vn -0.200900 -0.956500 -0.211500
vn 0.257500 0.008000 -0.966200
vn -0.362000 -0.694400 -0.621900
vn -0.889900 0.131900 -0.436700
vn -0.028800 0.821600 0.569300
vn -0.666400 -0.622200 -0.410900
vn 0.832900 0.468900 -0.294000
vn -0.425600 -0.903200 -0.055700
vn -0.085200 -0.059000 -0.994600
vn -0.864300 -0.488800 -0.118600
vn -0.946800 0.293700 -0.131300
vn -0.571700 -0.804700 0.160000
vn -0.408300 -0.490400 -0.769900
vn -0.113300 -0.809700 0.575800
vn -0.054000 -0.762200 0.645100
vn 0.032500 -0.725800 0.687100
vn 0.133100 -0.706200 0.695400
vn 0.232400 -0.706200 0.668800
vn 0.408300 0.490400 0.769900
vn 0.315400 -0.725800 0.611300
vn 0.369300 -0.762200 0.531700
vn 0.386000 -0.809700 0.442000
vn 0.363000 -0.861100 0.356000
vn 0.303700 -0.908600 0.286700
vn 0.217100 -0.945000 0.244700
vn 0.116600 -0.964600 0.236400
vn 0.017200 -0.964600 0.263000
vn 0.678600 -0.277800 -0.679900
vn -0.065700 -0.945000 0.320500
vn -0.119600 -0.908600 0.400100
vn -0.925700 -0.314500 0.210400
vn -0.136400 -0.861100 0.489800
vn 0.309600 0.821600 0.478700
vn -0.617000 -0.676000 0.402900
vn 0.224100 0.500000 0.836500
vn 0.965900 -0.000000 -0.258800
vn 0.015500 -0.998200 0.057900
vn -0.224100 -0.500000 -0.836500
vn -0.965900 0.000000 0.258800
vn -0.524500 0.353600 0.774500
vn 0.841500 0.353600 0.408500
vn 0.316200 0.774600 -0.547700
vn -0.216000 0.551000 -0.806100
vn -0.547700 0.774600 -0.316200
vn -0.316200 -0.774600 0.547700
vn -0.015500 0.998200 -0.057900
vn 0.216000 -0.551000 0.806100
vn 0.547700 -0.774600 0.316200
vn -0.991100 -0.097500 0.090700
vn -0.129400 0.866000 -0.482900
vn -0.408300 -0.490400 -0.770000
s off
f 1/1/1 2/2/1 3/3/1
f 4/4/2 5/5/2 6/6/2
f 7/7/3 8/8/3 9/9/3
f 10/10/4 11/11/4 6/6/4
f 5/12/5 12/13/5 13/14/5
f 14/15/6 15/16/6 16/17/6
f 17/18/7 6/19/7 13/14/7
f 18/20/8 19/21/8 20/22/8
f 7/23/9 21/24/9 22/25/9
f 13/26/10 23/27/10 24/28/10
f 14/29/11 25/30/11 9/31/11
f 12/32/12 26/33/12 23/27/12
f 27/16/13 20/17/13 28/34/13
f 23/35/14 29/36/14 30/37/14
f 31/1/15 32/2/15 22/3/15
f 23/35/16 26/38/16 33/39/16
f 18/40/17 31/41/17 34/42/17
f 30/37/18 29/43/18 35/44/18
f 36/45/19 37/29/19 28/30/19
f 33/46/20 38/47/20 35/44/20
f 39/48/21 40/49/21 41/50/21
f 35/51/22 42/52/22 43/53/22
f 44/54/23 41/55/23 45/56/23
f 38/57/24 46/58/24 42/52/24
f 43/59/25 42/60/25 47/61/25
f 36/8/26 48/9/26 40/62/26
f 42/60/27 46/63/27 49/64/27
f 50/40/28 1/41/28 51/42/28
f 16/65/29 51/66/29 40/67/29
f 49/68/30 52/5/30 53/6/30
f 54/69/31 15/16/31 14/15/31
f 47/11/32 53/6/32 55/18/32
f 56/70/33 57/23/33 2/71/33
f 53/19/34 52/12/34 58/13/34
f 59/72/35 37/29/35 36/45/35
f 53/19/36 60/14/36 61/73/36
f 62/74/37 63/70/37 7/23/37
f 58/32/38 64/33/38 65/27/38
f 66/69/39 27/16/39 37/15/39
f 60/26/40 65/27/40 67/75/40
f 54/69/41 68/76/41 50/20/41
f 64/38/42 69/39/42 70/77/42
f 56/70/43 71/78/43 44/54/43
f 67/75/44 65/79/44 70/77/44
f 72/80/45 18/20/45 27/81/45
f 69/46/46 73/47/46 74/44/46
f 63/82/47 75/83/47 8/8/47
f 76/37/48 70/43/48 74/44/48
f 74/51/49 73/57/49 77/58/49
f 78/84/50 1/41/50 50/40/50
f 79/85/51 74/51/51 80/52/51
f 81/82/52 39/48/52 44/86/52
f 82/84/53 31/41/53 18/40/53
f 83/53/54 80/87/54 84/88/54
f 85/72/55 14/29/55 8/89/55
f 77/90/56 86/91/56 84/88/56
f 78/84/57 87/92/57 2/2/57
f 84/93/58 88/94/58 89/59/58
f 90/83/59 36/8/59 39/7/59
f 86/95/60 91/96/60 88/94/60
f 57/23/61 45/24/61 3/25/61
f 4/4/62 92/97/62 5/5/62
f 5/12/63 92/98/63 12/13/63
f 10/10/19 17/18/19 59/72/19
f 12/32/64 92/99/64 26/33/64
f 61/73/6 54/69/6 85/72/6
f 26/38/65 92/100/65 33/39/65
f 55/18/11 85/72/11 75/83/11
f 33/46/66 92/101/66 38/47/66
f 93/102/67 62/92/67 82/84/67
f 38/57/68 92/103/68 46/58/68
f 30/37/17 82/84/17 72/80/17
f 46/63/69 92/104/69 49/64/69
f 79/102/1 87/92/1 78/84/1
f 49/68/70 92/97/70 52/5/70
f 94/73/13 66/69/13 59/72/13
f 76/37/28 78/84/28 68/76/28
f 52/12/71 92/98/71 58/13/71
f 94/73/8 24/28/8 72/80/8
f 58/32/72 92/99/72 64/33/72
f 95/10/3 75/83/3 63/82/3
f 64/38/73 92/100/73 69/39/73
f 69/46/74 92/101/74 73/47/74
f 89/59/21 81/82/21 71/78/21
f 73/57/75 92/103/75 77/58/75
f 67/75/76 68/76/76 54/69/76
f 77/90/77 92/105/77 86/91/77
f 79/85/61 83/53/61 56/70/61
f 86/95/78 92/106/78 91/96/78
f 83/53/23 96/107/23 71/78/23
f 89/59/79 88/60/79 11/61/79
f 91/63/80 92/104/80 4/64/80
f 62/92/81 32/2/81 31/1/81
f 10/10/26 90/83/26 81/82/26
f 91/63/82 4/64/82 11/61/82
f 50/20/76 97/21/76 16/22/76
f 98/108/83 99/109/83 100/110/83
f 101/111/84 100/112/84 99/113/84
f 101/114/85 103/115/85 102/116/85
f 104/117/86 106/118/86 105/119/86
f 103/120/84 107/121/84 108/122/84
f 102/123/87 110/124/87 109/125/87
f 7/126/88 105/127/88 21/128/88
f 106/129/89 101/130/89 27/131/89
f 41/132/88 100/133/88 44/134/88
f 111/135/89 98/136/89 97/137/89
f 110/124/90 112/138/90 106/139/90
f 106/140/91 112/141/91 113/142/91
f 105/143/92 113/144/92 108/122/92
f 103/120/93 111/145/93 107/121/93
f 103/115/83 113/142/83 112/141/83
f 104/146/87 98/147/87 111/145/87
f 14/148/83 114/149/83 115/150/83
f 116/151/83 117/152/83 36/153/83
f 118/154/84 2/155/84 119/156/84
f 34/157/84 120/158/84 121/159/84
f 116/160/88 121/161/88 120/162/88
f 115/163/89 120/164/89 121/165/89
f 118/166/88 119/167/88 114/168/88
f 118/169/89 116/170/89 117/171/89
f 98/172/94 108/173/94 110/174/94
f 107/175/95 100/110/95 109/176/95
f 108/173/86 109/176/86 110/174/86
f 100/112/96 102/123/96 109/125/96
f 51/177/1 1/1/1 3/3/1
f 11/11/2 4/4/2 6/6/2
f 21/62/3 7/7/3 9/9/3
f 17/18/4 10/10/4 6/6/4
f 6/19/5 5/12/5 13/14/5
f 25/34/6 14/15/6 16/17/6
f 94/73/7 17/18/7 13/14/7
f 27/81/8 18/20/8 20/22/8
f 32/71/9 7/23/9 22/25/9
f 94/73/10 13/26/10 24/28/10
f 8/89/11 14/29/11 9/31/11
f 13/26/12 12/32/12 23/27/12
f 37/15/13 27/16/13 28/34/13
f 24/28/14 23/35/14 30/37/14
f 34/177/15 31/1/15 22/3/15
f 29/36/16 23/35/16 33/39/16
f 19/178/17 18/40/17 34/42/17
f 93/102/18 30/37/18 35/44/18
f 48/179/19 36/45/19 28/30/19
f 29/43/20 33/46/20 35/44/20
f 44/86/21 39/48/21 41/50/21
f 93/85/22 35/51/22 43/53/22
f 57/180/23 44/54/23 45/56/23
f 35/51/24 38/57/24 42/52/24
f 95/10/25 43/59/25 47/61/25
f 39/7/97 36/8/97 40/62/97
f 47/61/27 42/60/27 49/64/27
f 97/178/28 50/40/28 51/42/28
f 40/67/29 48/181/29 28/182/29
f 28/182/29 20/183/29 40/67/29
f 19/184/29 34/185/29 22/186/29
f 22/186/29 21/187/29 9/188/29
f 9/188/29 25/189/29 16/65/29
f 16/65/98 97/190/98 51/66/98
f 51/66/29 3/191/29 45/192/29
f 45/192/29 41/193/29 40/67/29
f 40/67/29 20/183/29 19/184/29
f 19/184/29 22/186/29 40/67/29
f 9/188/29 16/65/29 40/67/29
f 51/66/29 45/192/29 40/67/29
f 40/67/29 22/186/29 9/188/29
f 47/11/30 49/68/30 53/6/30
f 85/72/31 54/69/31 14/15/31
f 95/10/32 47/11/32 55/18/32
f 87/74/33 56/70/33 2/71/33
f 60/14/34 53/19/34 58/13/34
f 90/83/35 59/72/35 36/45/35
f 55/18/36 53/19/36 61/73/36
f 32/71/37 62/74/37 7/23/37
f 60/26/38 58/32/38 65/27/38
f 59/72/39 66/69/39 37/15/39
f 61/73/40 60/26/40 67/75/40
f 15/81/41 54/69/41 50/20/41
f 65/79/42 64/38/42 70/77/42
f 57/180/43 56/70/43 44/54/43
f 76/37/44 67/75/44 70/77/44
f 66/69/45 72/80/45 27/81/45
f 70/43/46 69/46/46 74/44/46
f 7/7/47 63/82/47 8/8/47
f 79/102/48 76/37/48 74/44/48
f 80/52/49 74/51/49 77/58/49
f 68/76/50 78/84/50 50/40/50
f 83/53/51 79/85/51 80/52/51
f 71/78/52 81/82/52 44/86/52
f 72/80/53 82/84/53 18/40/53
f 96/107/54 83/53/54 84/88/54
f 75/83/55 85/72/55 8/89/55
f 80/87/56 77/90/56 84/88/56
f 1/1/57 78/84/57 2/2/57
f 96/107/58 84/93/58 89/59/58
f 81/82/59 90/83/59 39/7/59
f 84/93/60 86/95/60 88/94/60
f 2/71/99 57/23/99 3/25/99
f 90/83/19 10/10/19 59/72/19
f 55/18/6 61/73/6 85/72/6
f 95/10/11 55/18/11 75/83/11
f 30/37/67 93/102/67 82/84/67
f 24/28/17 30/37/17 72/80/17
f 76/37/1 79/102/1 78/84/1
f 17/18/13 94/73/13 59/72/13
f 67/75/28 76/37/28 68/76/28
f 66/69/8 94/73/8 72/80/8
f 43/59/3 95/10/3 63/82/3
f 96/107/21 89/59/21 71/78/21
f 61/73/76 67/75/76 54/69/76
f 87/74/61 79/85/61 56/70/61
f 56/70/23 83/53/23 71/78/23
f 10/10/79 89/59/79 11/61/79
f 82/84/81 62/92/81 31/1/81
f 89/59/26 10/10/26 81/82/26
f 88/60/82 91/63/82 11/61/82
f 15/81/76 50/20/76 16/22/76
f 111/194/83 98/108/83 100/110/83
f 106/195/84 101/111/84 99/113/84
f 104/117/85 103/115/85 101/114/85
f 101/114/86 106/118/86 104/117/86
f 113/144/84 103/120/84 108/122/84
f 112/138/87 110/124/87 102/123/87
f 104/196/88 105/127/88 7/126/88
f 20/197/89 106/129/89 27/131/89
f 99/198/88 100/133/88 41/132/88
f 50/199/89 111/135/89 97/137/89
f 99/200/90 110/124/90 106/139/90
f 105/201/91 106/140/91 113/142/91
f 98/202/92 105/143/92 108/122/92
f 104/146/93 111/145/93 103/120/93
f 102/116/83 103/115/83 112/141/83
f 105/203/87 98/147/87 104/146/87
f 25/204/83 14/148/83 115/150/83
f 48/205/83 116/151/83 36/153/83
f 3/206/84 2/155/84 118/154/84
f 31/207/84 34/157/84 121/159/84
f 117/208/88 121/161/88 116/160/88
f 114/209/89 115/163/89 121/165/89
f 115/210/88 118/166/88 114/168/88
f 119/211/89 118/169/89 117/171/89
f 99/212/94 98/172/94 110/174/94
f 111/194/95 100/110/95 107/175/95
f 107/175/86 109/176/86 108/173/86
f 101/111/96 102/123/96 100/112/96
f 125/213/9 122/214/9 124/215/9
f 123/216/9 125/213/9 124/215/9

View File

@ -1,685 +0,0 @@
# Blender v2.70 (sub 0) OBJ File: 'BombGenericLarge.blend'
# www.blender.org
o Cylinder
v 0.265165 0.640165 -0.914583
v 0.265165 0.640165 0.960417
v 0.346455 0.518507 -0.914583
v 0.346455 0.518506 0.960417
v 0.375000 0.375000 -0.914583
v 0.375000 0.375000 0.960417
v 0.346455 0.231494 -0.914583
v 0.346454 0.231493 0.960417
v 0.265165 0.109835 -0.914583
v 0.265165 0.109835 0.960417
v 0.143506 0.028545 -0.914583
v 0.143506 0.028545 0.960416
v 0.000000 0.000000 -0.914584
v -0.000000 -0.000000 0.960416
v -0.143506 0.028546 -0.914584
v -0.143507 0.028545 0.960416
v -0.265165 0.109835 -0.914584
v -0.265165 0.109835 0.960416
v -0.346454 0.231494 -0.914584
v -0.346455 0.231493 0.960416
v -0.375000 0.375000 -0.914584
v -0.375000 0.375000 0.960416
v -0.346454 0.518507 -0.914584
v -0.346455 0.518506 0.960416
v -0.265165 0.640165 -0.914583
v -0.265165 0.640165 0.960417
v -0.143506 0.721455 -0.914583
v -0.143506 0.721455 0.960417
v 0.000001 0.750000 -0.914583
v -0.000000 0.750000 0.960417
v 0.143507 0.721455 -0.914583
v 0.143506 0.721454 0.960417
v 0.132583 0.507582 1.185417
v 0.071753 0.548227 1.185417
v 0.000000 0.562500 1.185417
v -0.071753 0.548227 1.185417
v -0.132582 0.507583 1.185417
v -0.173227 0.446753 1.185417
v -0.187500 0.375000 1.185417
v -0.173227 0.303247 1.185417
v -0.132583 0.242418 1.185417
v -0.071753 0.201773 1.185417
v -0.000000 0.187500 1.185417
v 0.071753 0.201773 1.185417
v 0.132582 0.242417 1.185417
v 0.173227 0.303247 1.185417
v 0.187500 0.375000 1.185417
v 0.173227 0.446753 1.185417
v 0.132583 0.507582 -1.364583
v 0.071753 0.548227 -1.364583
v 0.000000 0.562500 -1.364583
v -0.071753 0.548227 -1.364583
v -0.132582 0.507583 -1.364583
v -0.173227 0.446753 -1.364583
v -0.187500 0.375000 -1.364583
v -0.173227 0.303247 -1.364583
v -0.132583 0.242417 -1.364583
v -0.071753 0.201773 -1.364583
v -0.000000 0.187500 -1.364583
v 0.071753 0.201773 -1.364583
v 0.132582 0.242417 -1.364583
v 0.173227 0.303247 -1.364583
v 0.187500 0.375000 -1.364583
v 0.173227 0.446753 -1.364583
v 0.132583 0.507582 -1.664583
v 0.071753 0.548227 -1.664583
v 0.000000 0.562500 -1.664583
v -0.071753 0.548227 -1.664583
v -0.132582 0.507583 -1.664583
v -0.173227 0.446753 -1.664583
v -0.187500 0.375000 -1.664583
v -0.173227 0.303247 -1.664583
v -0.132583 0.242417 -1.664583
v -0.071753 0.201773 -1.664583
v -0.000000 0.187500 -1.664583
v 0.071753 0.201773 -1.664583
v 0.132582 0.242417 -1.664583
v 0.173227 0.303247 -1.664583
v 0.187500 0.375000 -1.664583
v 0.173227 0.446753 -1.664583
v -0.371231 0.746231 -1.213083
v 0.371231 0.003769 -1.213083
v -0.371231 0.746231 -1.591083
v 0.371231 0.003769 -1.591083
v -0.371231 0.746231 -1.213083
v 0.371231 0.003769 -1.213083
v -0.371231 0.746231 -1.591083
v 0.371231 0.003769 -1.591083
v 0.371232 0.746231 -1.213083
v -0.371231 0.003769 -1.213083
v 0.371232 0.746231 -1.591083
v -0.371231 0.003769 -1.591083
v 0.371232 0.746231 -1.213083
v -0.371231 0.003769 -1.213083
v 0.371232 0.746231 -1.591083
v -0.371231 0.003769 -1.591083
vt 0.484392 0.017784
vt 0.484392 0.388294
vt 0.455678 0.388294
vt 0.548430 0.388294
vt 0.519716 0.388294
vt 0.519716 0.017784
vt 0.110414 0.631349
vt 0.081700 0.631349
vt 0.081700 0.260839
vt 0.455678 0.794374
vt 0.455678 0.423863
vt 0.484392 0.423863
vt 0.676506 0.388294
vt 0.647792 0.388294
vt 0.647792 0.017784
vt 0.740544 0.017785
vt 0.740544 0.388295
vt 0.711830 0.388295
vt 0.612468 0.794374
vt 0.583754 0.794374
vt 0.583754 0.423864
vt 0.519716 0.794374
vt 0.519716 0.423863
vt 0.548430 0.423863
vt 0.804581 0.423864
vt 0.804581 0.794374
vt 0.775868 0.794374
vt 0.740544 0.794374
vt 0.711830 0.794374
vt 0.711830 0.423864
vt 0.172632 0.260839
vt 0.201346 0.260839
vt 0.201346 0.631349
vt 0.647792 0.794373
vt 0.647792 0.423863
vt 0.676506 0.423863
vt 0.265384 0.260839
vt 0.265384 0.631349
vt 0.236670 0.631349
vt 0.612468 0.017784
vt 0.612468 0.388295
vt 0.583754 0.388295
vt 0.374888 0.631349
vt 0.346174 0.631349
vt 0.346174 0.260839
vt 0.046376 0.260839
vt 0.046376 0.631349
vt 0.017662 0.631349
vt 0.932657 0.651554
vt 0.903943 0.651554
vt 0.911122 0.594132
vt 0.932657 0.481286
vt 0.903943 0.481286
vt 0.911122 0.423864
vt 0.932657 0.388295
vt 0.903943 0.388295
vt 0.911122 0.330872
vt 0.305356 0.682673
vt 0.244167 0.723842
vt 0.254319 0.672450
vt 0.932657 0.744546
vt 0.903943 0.744546
vt 0.911122 0.687123
vt 0.484392 0.887365
vt 0.455678 0.887365
vt 0.462856 0.829943
vt 0.676506 0.887365
vt 0.647792 0.887365
vt 0.654970 0.829942
vt 0.548430 0.887365
vt 0.519716 0.887365
vt 0.526894 0.829942
vt 0.201346 0.855971
vt 0.172632 0.855971
vt 0.179811 0.798548
vt 0.711830 0.887365
vt 0.719008 0.829943
vt 0.733365 0.829943
vt 0.775868 0.887365
vt 0.783046 0.829942
vt 0.797403 0.829942
vt 0.839905 0.876176
vt 0.847084 0.818753
vt 0.861441 0.818753
vt 0.583754 0.887365
vt 0.590933 0.829943
vt 0.605290 0.829943
vt 0.903943 0.206837
vt 0.911122 0.149415
vt 0.925479 0.149415
vt 0.903943 0.113846
vt 0.911122 0.056423
vt 0.925479 0.056423
vt 0.903943 0.876176
vt 0.911122 0.818753
vt 0.925479 0.818753
vt 0.172632 0.948962
vt 0.179811 0.891540
vt 0.194168 0.891540
vt 0.346174 0.696029
vt 0.412857 0.682673
vt 0.346174 0.710485
vt 0.982338 0.242406
vt 0.982338 0.301688
vt 0.967981 0.301688
vt 0.662149 0.922934
vt 0.676506 0.922934
vt 0.676506 0.982215
vt 0.953624 0.911745
vt 0.967981 0.911745
vt 0.967981 0.971026
vt 0.534073 0.922934
vt 0.534073 0.982215
vt 0.519716 0.982215
vt 0.740544 0.982216
vt 0.726187 0.982216
vt 0.726187 0.922934
vt 0.903943 0.911745
vt 0.918300 0.911745
vt 0.918300 0.971026
vt 0.790224 0.982215
vt 0.775868 0.982215
vt 0.775868 0.922934
vt 0.246812 0.966077
vt 0.246812 0.906795
vt 0.261169 0.906795
vt 0.346174 0.906795
vt 0.360531 0.906795
vt 0.360531 0.966077
vt 0.967981 0.653414
vt 0.967981 0.594132
vt 0.982338 0.594132
vt 0.612468 0.922934
vt 0.612468 0.982216
vt 0.598111 0.982216
vt 0.967981 0.206837
vt 0.967981 0.147555
vt 0.982338 0.147555
vt 0.470035 0.922934
vt 0.484392 0.922934
vt 0.484392 0.982216
vt 0.403994 0.966077
vt 0.403994 0.906795
vt 0.418351 0.906795
vt 0.296493 0.966077
vt 0.296493 0.906795
vt 0.310850 0.906795
vt 0.854262 0.971026
vt 0.854262 0.911745
vt 0.868619 0.911745
vt 0.172632 0.762979
vt 0.179811 0.666918
vt 0.194168 0.666918
vt 0.396816 0.775165
vt 0.411173 0.775165
vt 0.418351 0.871226
vt 0.282136 0.871226
vt 0.289315 0.775165
vt 0.303672 0.775165
vt 0.839905 0.388295
vt 0.847084 0.292233
vt 0.861441 0.292233
vt 0.017662 0.762979
vt 0.024841 0.666918
vt 0.039198 0.666918
vt 0.839905 0.113846
vt 0.847084 0.017785
vt 0.861441 0.017785
vt 0.775868 0.388295
vt 0.783046 0.292234
vt 0.797403 0.292234
vt 0.839905 0.651554
vt 0.847084 0.555493
vt 0.861441 0.555493
vt 0.847084 0.687123
vt 0.861441 0.687123
vt 0.868619 0.783184
vt 0.024840 0.798548
vt 0.039197 0.798548
vt 0.046376 0.894609
vt 0.103235 0.894609
vt 0.088878 0.894609
vt 0.081700 0.798548
vt 0.861441 0.245476
vt 0.847084 0.245476
vt 0.839905 0.149415
vt 0.847084 0.423864
vt 0.861441 0.423864
vt 0.868619 0.519925
vt 0.783046 0.149415
vt 0.797403 0.149415
vt 0.804581 0.245476
vt 0.783046 0.017785
vt 0.797403 0.017784
vt 0.804581 0.113846
vt 0.088878 0.666918
vt 0.103235 0.666918
vt 0.110414 0.762979
vt 0.201346 0.225270
vt 0.127166 0.225270
vt 0.127166 0.017785
vt 0.420354 0.017784
vt 0.420354 0.225270
vt 0.346174 0.225270
vt 0.236670 0.225270
vt 0.236670 0.017784
vt 0.310850 0.017784
vt 0.091842 0.017785
vt 0.091842 0.225270
vt 0.017662 0.225270
vt 0.455678 0.017784
vt 0.548430 0.017784
vt 0.110414 0.260839
vt 0.484392 0.794374
vt 0.676506 0.017785
vt 0.711830 0.017784
vt 0.612468 0.423864
vt 0.548430 0.794374
vt 0.775868 0.423864
vt 0.740544 0.423864
vt 0.172632 0.631349
vt 0.676506 0.794373
vt 0.236670 0.260839
vt 0.583754 0.017784
vt 0.374888 0.260839
vt 0.017662 0.260839
vt 0.925479 0.594132
vt 0.925479 0.423864
vt 0.925479 0.330872
vt 0.254319 0.734064
vt 0.267583 0.739596
vt 0.925479 0.687123
vt 0.244167 0.682673
vt 0.238673 0.696029
vt 0.281940 0.739596
vt 0.477213 0.829943
vt 0.310850 0.696029
vt 0.310850 0.710485
vt 0.305356 0.723842
vt 0.295204 0.734064
vt 0.281940 0.666918
vt 0.295204 0.672450
vt 0.238673 0.710485
vt 0.267583 0.666918
vt 0.669327 0.829942
vt 0.541251 0.829942
vt 0.194168 0.798548
vt 0.740544 0.887365
vt 0.804581 0.887365
vt 0.868619 0.876176
vt 0.612468 0.887365
vt 0.932657 0.206837
vt 0.932657 0.113846
vt 0.932657 0.876176
vt 0.201346 0.948962
vt 0.361820 0.734064
vt 0.402705 0.734064
vt 0.389441 0.739596
vt 0.375084 0.666918
vt 0.402705 0.672450
vt 0.418351 0.696029
vt 0.418351 0.710485
vt 0.412857 0.723842
vt 0.375084 0.739596
vt 0.967981 0.242406
vt 0.351668 0.682673
vt 0.361820 0.672450
vt 0.662149 0.982215
vt 0.351668 0.723842
vt 0.389441 0.666918
vt 0.953624 0.971026
vt 0.519716 0.922934
vt 0.740544 0.922934
vt 0.903943 0.971026
vt 0.790224 0.922934
vt 0.261169 0.966077
vt 0.346174 0.966077
vt 0.982338 0.653414
vt 0.598111 0.922934
vt 0.982338 0.206837
vt 0.470035 0.982216
vt 0.418351 0.966077
vt 0.310850 0.966077
vt 0.868619 0.971026
vt 0.201346 0.762979
vt 0.389638 0.871226
vt 0.310850 0.871226
vt 0.868619 0.388295
vt 0.046376 0.762979
vt 0.868619 0.113846
vt 0.804582 0.388295
vt 0.868619 0.651554
vt 0.839905 0.783184
vt 0.017662 0.894609
vt 0.110414 0.798548
vt 0.868619 0.149415
vt 0.839905 0.519925
vt 0.775868 0.245476
vt 0.775868 0.113846
vt 0.081700 0.762979
vt 0.201346 0.017784
vt 0.346174 0.017784
vt 0.310850 0.225270
vt 0.017662 0.017784
vn 0.831470 0.555569 0.000001
vn 0.980785 0.195090 0.000000
vn 0.980785 -0.195091 0.000000
vn 0.831470 -0.555570 0.000000
vn 0.555570 -0.831470 -0.000000
vn 0.195090 -0.980785 -0.000000
vn -0.195091 -0.980785 -0.000000
vn -0.555571 -0.831469 -0.000001
vn -0.831470 -0.555570 -0.000001
vn -0.980785 -0.195090 -0.000000
vn -0.980785 0.195090 -0.000000
vn -0.831469 0.555571 -0.000000
vn -0.555570 0.831470 0.000000
vn -0.195090 0.980785 0.000000
vn 0.555571 0.831469 0.000000
vn 0.195091 0.980785 0.000000
vn 0.643794 0.430169 0.632838
vn 0.759407 0.151055 0.632837
vn 0.759406 -0.151056 0.632838
vn 0.000001 -0.000001 1.000000
vn 0.643793 -0.430170 0.632838
vn 0.430169 -0.643794 0.632838
vn 0.151054 -0.759406 0.632839
vn -0.151055 -0.759406 0.632839
vn -0.430170 -0.643793 0.632839
vn -0.643793 -0.430168 0.632839
vn -0.759406 -0.151056 0.632838
vn -0.759407 0.151054 0.632838
vn -0.643794 0.430170 0.632838
vn -0.430168 0.643795 0.632838
vn -0.151056 0.759406 0.632839
vn 0.151056 0.759407 0.632838
vn 0.430169 0.643794 0.632838
vn 0.000000 -0.000000 -1.000000
vn 0.831470 0.555570 0.000000
vn 0.980785 0.195091 0.000000
vn 0.980785 -0.195090 -0.000000
vn 0.831469 -0.555570 0.000000
vn -0.555571 -0.831469 0.000000
vn -0.831470 -0.555569 0.000000
vn -0.980785 0.195091 0.000000
vn -0.831470 0.555570 0.000000
vn 0.555570 0.831470 0.000000
vn 0.769680 0.514283 -0.378292
vn 0.514284 0.769680 -0.378292
vn 0.180592 0.907899 -0.378293
vn -0.180593 0.907899 -0.378292
vn -0.514282 0.769681 -0.378292
vn -0.769680 0.514284 -0.378291
vn -0.907900 0.180593 -0.378291
vn -0.907900 -0.180592 -0.378291
vn -0.769681 -0.514284 -0.378290
vn -0.514284 -0.769680 -0.378291
vn -0.180593 -0.907900 -0.378291
vn 0.180592 -0.907900 -0.378291
vn 0.514284 -0.769680 -0.378292
vn 0.769680 -0.514284 -0.378292
vn 0.907899 -0.180592 -0.378292
vn 0.907899 0.180593 -0.378292
vn 0.707107 0.707107 0.000000
vn -0.707107 -0.707107 0.000000
vn -0.707106 0.707108 0.000000
vn 0.707106 -0.707108 0.000000
vn 0.831470 0.555570 0.000001
vn -0.980785 -0.195091 -0.000000
vn 0.643794 0.430170 0.632837
vn 0.759407 -0.151056 0.632837
vn 0.000000 0.000000 1.000000
vn 0.643794 -0.430169 0.632838
vn 0.000000 -0.000002 1.000000
vn -0.000001 -0.000001 1.000000
vn 0.430168 -0.643794 0.632839
vn -0.000004 -0.000001 1.000000
vn 0.000007 -0.000002 1.000000
vn 0.000002 0.000004 1.000000
vn 0.000005 -0.000002 1.000000
vn 0.000000 0.000003 1.000000
vn 0.000000 -0.000001 1.000000
vn -0.000002 -0.000001 1.000000
vn -0.000003 -0.000001 1.000000
vn 0.151054 -0.759406 0.632838
vn -0.151056 -0.759405 0.632839
vn -0.430169 -0.643793 0.632839
vn -0.643793 -0.430169 0.632839
vn -0.759406 -0.151055 0.632839
vn -0.759406 0.151055 0.632838
vn -0.643794 0.430168 0.632838
vn -0.430170 0.643793 0.632839
vn -0.151055 0.759407 0.632838
vn 0.430170 0.643794 0.632838
vn 0.000003 0.000004 -1.000000
vn 0.000005 0.000003 -1.000000
vn -0.000007 0.000002 -1.000000
vn -0.000004 0.000000 -1.000000
vn 0.000000 0.000001 -1.000000
vn -0.000002 0.000000 -1.000000
vn 0.000001 -0.000001 -1.000000
vn 0.000000 0.000002 -1.000000
vn 0.000002 -0.000001 -1.000000
vn 0.000007 0.000005 -1.000000
vn 0.000001 0.000002 -1.000000
vn -0.555570 -0.831470 0.000000
vn -0.831470 -0.555570 0.000000
vn -0.195091 0.980785 0.000000
vn 0.514284 0.769679 -0.378292
vn 0.180593 0.907899 -0.378292
vn -0.180592 0.907900 -0.378292
vn -0.514284 0.769680 -0.378291
vn -0.769680 0.514285 -0.378291
vn -0.907900 -0.180593 -0.378291
vn -0.769680 -0.514284 -0.378291
vn -0.514284 -0.769681 -0.378291
vn 0.180593 -0.907900 -0.378291
vn 0.514284 -0.769680 -0.378291
vn 0.907899 -0.180593 -0.378292
vn 0.907899 0.180592 -0.378292
vn -0.707106 0.707107 0.000000
s off
f 1/1/1 2/2/1 4/3/1
f 4/4/2 6/5/2 5/6/2
f 6/7/3 8/8/3 7/9/3
f 7/10/4 8/11/4 10/12/4
f 10/13/5 12/14/5 11/15/5
f 11/16/6 12/17/6 14/18/6
f 14/19/7 16/20/7 15/21/7
f 15/22/8 16/23/8 18/24/8
f 17/25/9 18/26/9 20/27/9
f 20/28/10 22/29/10 21/30/10
f 22/31/11 24/32/11 23/33/11
f 23/34/12 24/35/12 26/36/12
f 25/37/13 26/38/13 28/39/13
f 27/40/14 28/41/14 30/42/14
f 32/43/15 2/44/15 1/45/15
f 29/46/16 30/47/16 32/48/16
f 4/49/17 2/50/17 33/51/17
f 6/52/18 4/53/18 48/54/18
f 8/55/19 6/56/19 47/57/19
f 44/58/20 36/59/20 40/60/20
f 10/61/21 8/62/21 46/63/21
f 12/64/22 10/65/22 45/66/22
f 14/67/23 12/68/23 44/69/23
f 16/70/24 14/71/24 43/72/24
f 18/73/25 16/74/25 42/75/25
f 18/76/26 41/77/26 40/78/26
f 20/79/27 40/80/27 39/81/27
f 22/82/28 39/83/28 38/84/28
f 24/85/29 38/86/29 37/87/29
f 26/88/30 37/89/30 36/90/30
f 28/91/31 36/92/31 35/93/31
f 30/94/32 35/95/32 34/96/32
f 32/97/33 34/98/33 33/99/33
f 69/100/34 79/101/34 70/102/34
f 64/103/35 80/104/35 65/105/35
f 79/106/36 80/107/36 64/108/36
f 78/109/37 79/110/37 63/111/37
f 61/112/38 77/113/38 78/114/38
f 76/115/5 77/116/5 61/117/5
f 75/118/6 76/119/6 60/120/6
f 74/121/7 75/122/7 59/123/7
f 57/124/39 73/125/39 74/126/39
f 72/127/40 73/128/40 57/129/40
f 55/130/10 71/131/10 72/132/10
f 54/133/41 70/134/41 71/135/41
f 53/136/42 69/137/42 70/138/42
f 68/139/13 69/140/13 53/141/13
f 49/142/43 65/143/43 66/144/43
f 50/145/16 66/146/16 67/147/16
f 51/148/14 67/149/14 68/150/14
f 3/151/44 64/152/44 49/153/44
f 49/154/45 50/155/45 31/156/45
f 31/157/46 50/158/46 51/159/46
f 29/160/47 51/161/47 52/162/47
f 27/163/48 52/164/48 53/165/48
f 25/166/49 53/167/49 54/168/49
f 23/169/50 54/170/50 55/171/50
f 21/172/51 55/173/51 56/174/51
f 56/175/52 57/176/52 17/177/52
f 57/178/53 58/179/53 15/180/53
f 58/181/54 59/182/54 13/183/54
f 59/184/55 60/185/55 11/186/55
f 60/187/56 61/188/56 9/189/56
f 61/190/57 62/191/57 7/192/57
f 62/193/58 63/194/58 5/195/58
f 63/196/59 64/197/59 3/198/59
f 82/199/60 84/200/60 83/201/60
f 87/202/61 88/203/61 86/204/61
f 91/205/62 92/206/62 90/207/62
f 93/208/63 94/209/63 96/210/63
f 3/211/64 1/1/64 4/3/64
f 3/212/2 4/4/2 5/6/2
f 5/213/3 6/7/3 7/9/3
f 9/214/4 7/10/4 10/12/4
f 9/215/5 10/13/5 11/15/5
f 13/216/6 11/16/6 14/18/6
f 13/217/7 14/19/7 15/21/7
f 17/218/8 15/22/8 18/24/8
f 19/219/9 17/25/9 20/27/9
f 19/220/65 20/28/65 21/30/65
f 21/221/41 22/31/41 23/33/41
f 25/222/12 23/34/12 26/36/12
f 27/223/13 25/37/13 28/39/13
f 29/224/14 27/40/14 30/42/14
f 31/225/15 32/43/15 1/45/15
f 31/226/16 29/46/16 32/48/16
f 48/227/66 4/49/66 33/51/66
f 47/228/18 6/52/18 48/54/18
f 46/229/67 8/55/67 47/57/67
f 35/230/68 36/59/68 34/231/68
f 45/232/69 10/61/69 46/63/69
f 39/233/70 40/60/70 38/234/70
f 44/58/71 33/235/71 36/59/71
f 44/236/72 12/64/72 45/66/72
f 45/237/73 33/235/73 44/58/73
f 45/237/74 46/238/74 47/239/74
f 47/239/70 48/240/70 33/235/70
f 42/241/75 43/242/75 44/58/75
f 40/60/76 37/243/76 38/234/76
f 36/59/77 33/235/77 34/231/77
f 45/237/78 47/239/78 33/235/78
f 40/60/79 42/241/79 44/58/79
f 40/60/68 41/244/68 42/241/68
f 36/59/80 37/243/80 40/60/80
f 43/245/81 14/67/81 44/69/81
f 42/246/82 16/70/82 43/72/82
f 41/247/83 18/73/83 42/75/83
f 20/248/84 18/76/84 40/78/84
f 22/249/85 20/79/85 39/81/85
f 24/250/86 22/82/86 38/84/86
f 26/251/87 24/85/87 37/87/87
f 28/252/88 26/88/88 36/90/88
f 30/253/89 28/91/89 35/93/89
f 32/254/32 30/94/32 34/96/32
f 2/255/90 32/97/90 33/99/90
f 72/256/91 75/257/91 74/258/91
f 79/101/92 66/259/92 80/260/92
f 79/101/93 78/261/93 77/262/93
f 77/262/94 76/263/94 75/257/94
f 73/264/34 72/256/34 74/258/34
f 72/256/95 79/101/95 77/262/95
f 49/265/35 64/103/35 65/105/35
f 69/100/96 68/266/96 67/267/96
f 63/268/2 79/106/2 64/108/2
f 75/257/97 72/256/97 77/262/97
f 72/256/98 71/269/98 70/102/98
f 79/101/99 67/267/99 66/259/99
f 66/259/100 65/270/100 80/260/100
f 70/102/101 79/101/101 72/256/101
f 69/100/34 67/267/34 79/101/34
f 62/271/3 78/109/3 63/111/3
f 62/272/38 61/112/38 78/114/38
f 60/273/5 76/115/5 61/117/5
f 59/274/6 75/118/6 60/120/6
f 58/275/7 74/121/7 59/123/7
f 58/276/102 57/124/102 74/126/102
f 56/277/103 72/127/103 57/129/103
f 56/278/10 55/130/10 72/132/10
f 55/279/11 54/133/11 71/135/11
f 54/280/12 53/136/12 70/138/12
f 52/281/13 68/139/13 53/141/13
f 50/282/15 49/142/15 66/144/15
f 51/283/16 50/145/16 67/147/16
f 52/284/104 51/148/104 68/150/104
f 1/285/44 3/151/44 49/153/44
f 1/286/105 49/154/105 31/156/105
f 29/287/106 31/157/106 51/159/106
f 27/288/107 29/160/107 52/162/107
f 25/289/108 27/163/108 53/165/108
f 23/290/109 25/166/109 54/168/109
f 21/291/50 23/169/50 55/171/50
f 19/292/110 21/172/110 56/174/110
f 19/293/111 56/175/111 17/177/111
f 17/294/112 57/178/112 15/180/112
f 15/295/54 58/181/54 13/183/54
f 13/296/113 59/184/113 11/186/113
f 11/297/114 60/187/114 9/189/114
f 9/298/57 61/190/57 7/192/57
f 7/299/115 62/193/115 5/195/115
f 5/300/116 63/196/116 3/198/116
f 81/301/60 82/199/60 83/201/60
f 85/302/61 87/202/61 86/204/61
f 89/303/117 91/205/117 90/207/117
f 95/304/63 93/208/63 96/210/63

View File

@ -1,685 +0,0 @@
# Blender v2.76 (sub 0) OBJ File: 'FatMan.blend'
# www.blender.org
o Cube.002_Cube.004
v 1.700000 1.100000 0.350000
v 1.700000 0.400000 0.350000
v 1.700000 1.100000 -0.350000
v 1.700000 0.400000 -0.350000
v 1.300000 1.050000 0.000000
v 1.700000 1.050000 0.000001
v 1.300000 0.992705 -0.176335
v 1.700000 0.992705 -0.176335
v 1.300000 0.842705 -0.285317
v 1.700000 0.842705 -0.285317
v 1.300000 0.657295 -0.285317
v 1.700000 0.657295 -0.285317
v 1.300000 0.507295 -0.176336
v 1.700000 0.507295 -0.176336
v 1.300000 0.450000 -0.000000
v 1.700000 0.450000 0.000000
v 1.300000 0.507295 0.176335
v 1.700000 0.507295 0.176336
v 1.300000 0.657295 0.285317
v 1.700000 0.657295 0.285317
v 1.300000 0.842705 0.285317
v 1.700000 0.842705 0.285317
v 1.300000 0.992705 0.176336
v 1.700000 0.992705 0.176336
v 1.300000 0.100000 0.650000
v 1.300000 0.100000 -0.650000
v 1.900000 0.100000 -0.650000
v 1.900000 0.100000 0.650000
v 1.300000 1.400000 0.650000
v 1.300000 1.400000 -0.650000
v 1.900000 1.400000 -0.650000
v 1.900000 1.400000 0.650000
v 1.300000 0.000000 0.750000
v 1.900000 0.000000 0.750000
v 1.300000 1.500000 0.750000
v 1.900000 1.500000 0.750000
v 1.300000 0.000000 -0.750000
v 1.900000 0.000000 -0.750000
v 1.300000 1.500000 -0.750000
v 1.900000 1.500000 -0.750000
v 1.300000 0.750000 0.650000
v 1.900000 0.750000 0.650000
v 1.900000 0.750000 -0.650000
v 1.300000 0.750000 -0.650000
v 1.300000 0.100000 -0.000000
v 1.900000 0.100000 -0.000000
v 1.300000 1.400000 -0.000000
v 1.900000 1.400000 -0.000000
v 0.900000 0.750000 -0.150000
v 1.700000 0.750000 -0.150000
v 0.899999 0.643934 -0.106066
v 1.700000 0.643934 -0.106066
v 0.899999 0.600000 0.000000
v 1.700000 0.600000 0.000000
v 0.899999 0.643934 0.106066
v 1.700000 0.643934 0.106066
v 0.900000 0.750000 0.150000
v 1.700000 0.750000 0.150000
v 0.900000 0.856066 0.106066
v 1.700000 0.856066 0.106066
v 0.900000 0.900000 0.000000
v 1.700000 0.900000 0.000000
v 0.900000 0.856066 -0.106066
v 1.700000 0.856066 -0.106066
v -0.850000 1.000000 -0.250000
v -0.850000 1.000000 -0.350000
v -0.550000 1.000000 -0.350000
v -0.550000 1.000000 -0.250000
v -0.850000 1.100000 -0.250000
v -0.850000 1.100000 -0.350000
v -0.550000 1.100000 -0.350000
v -0.550000 1.100000 -0.250000
v -0.850000 1.000000 0.350000
v -0.850000 1.000000 0.250000
v -0.550000 1.000000 0.250000
v -0.550000 1.000000 0.350000
v -0.850000 1.100000 0.350000
v -0.850000 1.100000 0.250000
v -0.550000 1.100000 0.250000
v -0.550000 1.100000 0.350000
v -0.850000 0.400000 -0.250000
v -0.850000 0.400000 -0.350000
v -0.550000 0.400000 -0.350000
v -0.550000 0.400000 -0.250000
v -0.850000 0.500000 -0.250000
v -0.850000 0.500000 -0.350000
v -0.550000 0.500000 -0.350000
v -0.550000 0.500000 -0.250000
v -0.850000 0.400000 0.350000
v -0.850000 0.400000 0.250000
v -0.550000 0.400000 0.250000
v -0.550000 0.400000 0.350000
v -0.850000 0.500000 0.350000
v -0.850000 0.500000 0.250000
v -0.550000 0.500000 0.250000
v -0.550000 0.500000 0.350000
v 0.382684 1.442910 0.000000
v 0.000001 1.500000 0.000000
v -0.382683 1.442910 0.000000
v -0.707106 1.280330 0.000000
v -0.923879 1.037013 0.000000
v -0.999999 0.750000 0.000000
v 0.382684 1.310576 -0.407282
v 0.000001 1.356763 -0.440839
v -0.382683 1.310576 -0.407282
v -0.707106 1.179046 -0.311720
v -0.923879 0.982198 -0.168702
v 0.382684 0.964121 -0.658996
v 0.000001 0.981763 -0.713292
v -0.382683 0.964121 -0.658996
v -0.707106 0.913881 -0.504374
v -0.923879 0.838692 -0.272965
v 0.382684 0.535880 -0.658996
v 0.000001 0.518238 -0.713292
v -0.382683 0.535880 -0.658996
v -0.707106 0.586119 -0.504374
v -0.923879 0.661309 -0.272965
v 0.382684 0.189425 -0.407282
v 0.000001 0.143238 -0.440839
v -0.382683 0.189425 -0.407282
v -0.707106 0.320954 -0.311720
v -0.923879 0.517802 -0.168702
v 0.382684 0.057091 0.000000
v 0.000001 0.000000 0.000000
v -0.382683 0.057091 0.000000
v -0.707106 0.219670 0.000000
v -0.923879 0.462988 0.000000
v 0.382684 0.189425 0.407282
v 0.000001 0.143238 0.440839
v -0.382683 0.189425 0.407282
v -0.707106 0.320954 0.311720
v -0.923879 0.517802 0.168702
v 0.382684 0.535880 0.658996
v 0.000001 0.518238 0.713292
v -0.382683 0.535880 0.658996
v -0.707106 0.586119 0.504374
v -0.923879 0.661309 0.272965
v 0.382684 0.964121 0.658996
v 0.000001 0.981763 0.713292
v -0.382683 0.964121 0.658996
v -0.707106 0.913881 0.504374
v -0.923879 0.838692 0.272965
v 0.382684 1.310576 0.407282
v 0.000001 1.356763 0.440839
v -0.382683 1.310576 0.407282
v -0.707106 1.179046 0.311720
v -0.923879 0.982198 0.168702
vt 0.988701 0.847760
vt 0.988701 0.905908
vt 0.863256 0.905908
vt 0.863220 0.847759
vt 0.863239 0.905906
vt 0.022598 0.714404
vt 0.106492 0.714404
vt 0.098481 0.739059
vt 0.022598 0.568772
vt 0.106492 0.568772
vt 0.106492 0.659658
vt 0.706128 0.609077
vt 0.706128 0.699962
vt 0.622234 0.699962
vt 0.725194 0.211026
vt 0.725194 0.301911
vt 0.641300 0.301911
vt 0.212229 0.568772
vt 0.212229 0.652667
vt 0.121344 0.652667
vt 0.022598 0.315025
vt 0.127466 0.301043
vt 0.232334 0.315025
vt 0.471773 0.147236
vt 0.541685 0.105289
vt 0.541685 0.196174
vt 0.626448 0.245113
vt 0.556536 0.287060
vt 0.556536 0.196174
vt 0.064545 0.553921
vt 0.022598 0.484009
vt 0.113483 0.484009
vt 0.456922 0.315025
vt 0.442939 0.301042
vt 0.442939 0.210157
vt 0.127466 0.119271
vt 0.022598 0.105289
vt 0.232334 0.105289
vt 0.456921 0.105289
vt 0.352054 0.119271
vt 0.247185 0.105289
vt 0.774794 0.329876
vt 0.774794 0.420762
vt 0.690899 0.420762
vt 0.218352 0.210157
vt 0.218352 0.119271
vt 0.442070 0.090437
vt 0.232334 0.090437
vt 0.232334 0.006543
vt 0.725194 0.105289
vt 0.725194 0.196174
vt 0.641300 0.196174
vt 0.036580 0.210157
vt 0.352053 0.301042
vt 0.651806 0.006543
vt 0.861541 0.006543
vt 0.861541 0.090437
vt 0.556328 0.639248
vt 0.556328 0.723142
vt 0.465443 0.723142
vt 0.022598 0.090437
vt 0.212229 0.667518
vt 0.212229 0.751413
vt 0.121344 0.751413
vt 0.442070 0.006543
vt 0.651806 0.090437
vt 0.261168 0.210157
vt 0.247185 0.315025
vt 0.380680 0.329876
vt 0.408644 0.437434
vt 0.324750 0.437434
vt 0.535321 0.539633
vt 0.465443 0.452286
vt 0.554974 0.452286
vt 0.130858 0.441010
vt 0.022598 0.469158
vt 0.049663 0.350987
vt 0.709581 0.524347
vt 0.622234 0.594225
vt 0.622234 0.504694
vt 0.253969 0.441010
vt 0.145709 0.469158
vt 0.172774 0.350987
vt 0.535355 0.437434
vt 0.423496 0.437434
vt 0.479425 0.329876
vt 0.577302 0.554484
vt 0.605267 0.624397
vt 0.521372 0.624397
vt 0.356168 0.609111
vt 0.268820 0.678989
vt 0.268820 0.589458
vt 0.408644 0.452286
vt 0.450592 0.522198
vt 0.359706 0.522198
vt 0.906630 0.571602
vt 0.896743 0.561715
vt 0.906630 0.551828
vt 0.876969 0.601264
vt 0.867082 0.591377
vt 0.916517 0.561715
vt 0.936291 0.522167
vt 0.867082 0.532054
vt 0.876969 0.522167
vt 0.936291 0.601264
vt 0.906630 0.665550
vt 0.896743 0.655663
vt 0.906630 0.645776
vt 0.876969 0.695211
vt 0.867082 0.685324
vt 0.916517 0.655663
vt 0.936291 0.616115
vt 0.867082 0.626002
vt 0.876969 0.616115
vt 0.936291 0.695211
vt 0.896919 0.464638
vt 0.906806 0.454751
vt 0.916693 0.464638
vt 0.867258 0.434977
vt 0.877145 0.425090
vt 0.906806 0.474525
vt 0.946354 0.494299
vt 0.936467 0.425090
vt 0.946354 0.434977
vt 0.867258 0.494299
vt 0.913788 0.349949
vt 0.913788 0.363931
vt 0.899806 0.363931
vt 0.955735 0.349949
vt 0.955735 0.363931
vt 0.899806 0.349949
vt 0.857859 0.363931
vt 0.913788 0.405878
vt 0.899806 0.405878
vt 0.913788 0.308001
vt 0.197478 0.825439
vt 0.197478 0.928229
vt 0.098037 0.904649
vt 0.431403 0.804150
vt 0.431403 0.949518
vt 0.310187 0.943985
vt 0.310187 0.809683
vt 0.552620 0.809683
vt 0.552620 0.943985
vt 0.310150 0.809683
vt 0.197442 0.928230
vt 0.197442 0.825440
vt 0.098001 0.904650
vt 0.098018 0.849020
vt 0.431386 0.804150
vt 0.009166 0.876834
vt 0.009129 0.876836
vt 0.863256 0.847760
vt 0.077507 0.754298
vt 0.051583 0.754298
vt 0.030609 0.739059
vt 0.030609 0.689748
vt 0.051583 0.674509
vt 0.077507 0.674509
vt 0.098481 0.689748
vt 0.022598 0.659658
vt 0.622234 0.609077
vt 0.641300 0.211026
vt 0.121344 0.568772
vt 0.218352 0.301043
vt 0.036581 0.301043
vt 0.541685 0.287060
vt 0.471773 0.245113
vt 0.556536 0.105289
vt 0.626448 0.147236
vt 0.204369 0.484009
vt 0.162422 0.553921
vt 0.442939 0.119271
vt 0.036580 0.119272
vt 0.261168 0.119271
vt 0.690899 0.329876
vt 0.641300 0.105289
vt 0.261168 0.301042
vt 0.465443 0.639248
vt 0.022598 0.006543
vt 0.121344 0.667518
vt 0.268820 0.329876
vt 0.607382 0.517796
vt 0.130858 0.329876
vt 0.687744 0.452286
vt 0.253969 0.329876
vt 0.563320 0.329876
vt 0.465443 0.554485
vt 0.334331 0.537049
vt 0.268820 0.522198
vt 0.310768 0.452286
vt 0.946178 0.532054
vt 0.946178 0.591377
vt 0.946178 0.626002
vt 0.946178 0.685324
vt 0.936467 0.504186
vt 0.877145 0.504186
vt 0.857859 0.349949
vt 0.899806 0.308001
vn 0.000000 0.951100 -0.309000
vn 0.000000 0.587800 -0.809000
vn 0.000000 0.000000 -1.000000
vn 0.000000 -0.587800 -0.809000
vn 0.000000 -0.951100 -0.309000
vn -0.000000 -0.951100 0.309000
vn -0.000000 -0.587800 0.809000
vn -0.000000 -0.000000 1.000000
vn 1.000000 0.000000 0.000000
vn -0.000000 0.951100 0.309000
vn -0.000000 0.587800 0.809000
vn 0.000000 1.000000 0.000000
vn 0.000000 -1.000000 0.000000
vn -0.600000 0.000000 -0.800000
vn -0.600000 0.000000 0.800000
vn -0.600000 -0.800000 0.000000
vn -1.000000 0.000000 0.000000
vn 0.000000 0.707100 0.707100
vn -0.000000 -0.707100 0.707100
vn 0.000000 0.707100 -0.707100
vn -0.600000 0.800000 0.000000
vn -0.729800 0.650200 -0.211300
vn -0.140500 0.941600 -0.306000
vn -0.430200 0.858500 -0.279000
vn 0.140500 0.941600 -0.306000
vn -0.140500 0.582000 -0.801000
vn -0.430200 0.530600 -0.730300
vn 0.140500 0.582000 -0.801000
vn -0.729800 0.401800 -0.553100
vn -0.430200 0.000000 -0.902700
vn 0.140500 0.000000 -0.990100
vn -0.729800 0.000000 -0.683700
vn -0.140500 0.000000 -0.990100
vn 0.140500 -0.582000 -0.801000
vn -0.729800 -0.401800 -0.553100
vn -0.140500 -0.582000 -0.801000
vn -0.430200 -0.530600 -0.730300
vn -0.729800 -0.650200 -0.211300
vn -0.140500 -0.941600 -0.306000
vn -0.430200 -0.858500 -0.279000
vn 0.140500 -0.941600 -0.306000
vn -0.430200 -0.858500 0.279000
vn 0.140500 -0.941600 0.306000
vn -0.729800 -0.650200 0.211300
vn -0.140500 -0.941600 0.306000
vn -0.430200 -0.530600 0.730300
vn 0.140500 -0.582000 0.801000
vn -0.729800 -0.401800 0.553100
vn -0.140500 -0.582000 0.801000
vn -0.729800 0.000000 0.683700
vn -0.140500 0.000000 0.990100
vn -0.430200 0.000000 0.902700
vn 0.140500 0.000000 0.990100
vn -0.729800 0.401800 0.553100
vn -0.140500 0.582000 0.801000
vn -0.430200 0.530600 0.730300
vn 0.140500 0.582000 0.801000
vn -0.963200 0.255500 -0.083000
vn -0.963200 0.157900 -0.217300
vn -0.963200 0.000000 -0.268600
vn 0.377300 0.880800 0.286200
vn 0.377300 0.880800 -0.286200
vn -0.963200 -0.157900 -0.217300
vn 0.377300 0.544400 -0.749200
vn -0.963200 -0.255500 -0.083000
vn 0.377300 0.000000 -0.926100
vn -0.963200 -0.255500 0.083000
vn -0.963200 -0.157900 0.217300
vn 0.377300 -0.544400 -0.749200
vn 0.377300 -0.880800 -0.286200
vn -0.963200 0.000000 0.268600
vn 0.377300 -0.880800 0.286200
vn -0.963200 0.157900 0.217300
vn 0.377300 -0.544400 0.749200
vn -0.963200 0.255500 0.083000
vn -0.430200 0.858500 0.279000
vn 0.140500 0.941600 0.306000
vn 0.377300 0.000000 0.926100
vn -0.729800 0.650200 0.211300
vn -0.140500 0.941600 0.306000
vn 0.377300 0.544400 0.749200
s off
f 6/1/1 8/2/1 7/3/1
f 7/4/2 8/1/2 10/2/2
f 10/1/3 12/2/3 11/3/3
f 12/1/4 14/2/4 13/3/4
f 13/4/5 14/1/5 16/2/5
f 16/1/6 18/2/6 17/5/6
f 17/4/7 18/1/7 20/2/7
f 20/1/8 22/2/8 21/5/8
f 22/6/9 12/7/9 10/8/9
f 23/4/10 24/1/10 6/2/10
f 22/1/11 24/2/11 23/3/11
f 27/9/12 26/10/12 45/11/12
f 43/12/8 31/13/8 30/14/8
f 41/15/3 29/16/3 32/17/3
f 30/18/13 31/19/13 48/20/13
f 36/21/9 48/22/9 40/23/9
f 2/24/14 25/25/14 41/26/14
f 3/27/15 30/28/15 44/29/15
f 1/30/16 29/31/16 47/32/16
f 33/33/17 25/34/17 45/35/17
f 46/36/9 34/37/9 38/38/9
f 37/39/17 44/40/17 39/41/17
f 25/42/3 41/43/3 42/44/3
f 43/45/9 27/46/9 38/38/9
f 40/47/3 38/48/3 37/49/3
f 27/50/8 43/51/8 44/52/8
f 36/21/9 34/37/9 42/53/9
f 41/54/17 25/34/17 33/33/17
f 35/55/8 33/56/8 34/57/8
f 46/58/12 45/59/12 25/60/12
f 37/49/13 38/48/13 34/61/13
f 47/62/13 48/63/13 32/64/13
f 39/65/12 35/55/12 36/66/12
f 39/41/17 47/67/17 35/68/17
f 64/69/18 31/70/18 30/71/18
f 50/72/13 49/73/13 44/74/13
f 52/75/19 51/76/19 26/77/19
f 54/78/8 53/79/8 45/80/8
f 56/81/18 55/82/18 25/83/18
f 60/84/20 59/85/20 29/86/20
f 62/87/8 48/88/8 47/89/8
f 58/90/12 57/91/12 41/92/12
f 4/93/21 26/94/21 45/95/21
f 70/96/17 66/97/17 65/98/17
f 71/99/3 67/100/3 66/97/3
f 69/101/8 65/98/8 68/102/8
f 66/97/13 67/103/13 68/104/13
f 71/105/12 70/96/12 69/101/12
f 78/106/17 74/107/17 73/108/17
f 79/109/3 75/110/3 74/107/3
f 77/111/8 73/108/8 76/112/8
f 74/107/13 75/113/13 76/114/13
f 79/115/12 78/106/12 77/111/12
f 86/116/17 82/117/17 81/118/17
f 87/119/3 83/120/3 82/117/3
f 85/121/8 81/118/8 84/122/8
f 82/117/13 83/123/13 84/124/13
f 87/125/12 86/116/12 85/121/12
f 94/126/17 90/127/17 89/128/17
f 95/129/3 91/130/3 90/127/3
f 93/131/8 89/128/8 92/132/8
f 90/127/13 91/133/13 92/134/13
f 95/135/12 94/126/12 93/131/12
f 100/136/22 106/137/22 107/138/22
f 98/139/23 104/140/23 105/141/23
f 100/136/24 99/142/24 105/141/24
f 97/143/25 103/144/25 104/140/25
f 104/139/26 109/140/26 110/141/26
f 105/145/27 110/141/27 111/146/27
f 103/143/28 108/144/28 109/140/28
f 106/147/29 111/146/29 112/148/29
f 110/142/30 115/141/30 116/137/30
f 108/143/31 113/144/31 114/140/31
f 111/136/32 116/137/32 117/148/32
f 110/142/33 109/139/33 114/140/33
f 114/139/34 113/143/34 118/144/34
f 116/136/35 121/137/35 122/138/35
f 114/139/36 119/140/36 120/141/36
f 115/142/37 120/141/37 121/137/37
f 122/149/38 121/136/38 126/137/38
f 119/139/39 124/140/39 125/141/39
f 120/142/40 125/141/40 126/137/40
f 118/143/41 123/144/41 124/140/41
f 125/142/42 130/141/42 131/137/42
f 123/143/43 128/144/43 129/140/43
f 126/136/44 131/137/44 132/138/44
f 125/142/45 124/150/45 129/140/45
f 131/136/46 130/142/46 135/141/46
f 128/143/47 133/144/47 134/140/47
f 131/136/48 136/137/48 137/138/48
f 129/139/49 134/140/49 135/141/49
f 136/136/50 141/137/50 142/148/50
f 135/142/51 134/139/51 139/140/51
f 136/136/52 135/142/52 140/141/52
f 133/143/53 138/144/53 139/140/53
f 142/149/54 141/136/54 146/137/54
f 140/142/55 139/139/55 144/140/55
f 140/142/56 145/141/56 146/137/56
f 138/143/57 143/144/57 144/140/57
f 102/151/58 101/149/58 107/138/58
f 102/152/59 107/149/59 112/148/59
f 102/151/60 112/149/60 117/148/60
f 97/144/61 143/143/61 23/4/61
f 5/153/62 7/3/62 103/144/62
f 102/151/63 117/149/63 122/138/63
f 9/5/64 108/144/64 103/143/64
f 102/152/65 122/149/65 127/138/65
f 113/144/66 108/143/66 9/153/66
f 102/152/67 127/149/67 132/138/67
f 102/151/68 132/149/68 137/138/68
f 13/3/69 118/144/69 113/143/69
f 15/5/70 123/144/70 118/143/70
f 102/151/71 137/149/71 142/148/71
f 17/5/72 128/144/72 123/143/72
f 102/151/73 142/149/73 147/148/73
f 19/5/74 133/144/74 128/143/74
f 102/152/75 147/149/75 101/148/75
f 145/142/76 99/141/76 100/137/76
f 143/143/77 97/144/77 98/140/77
f 21/5/78 138/144/78 133/143/78
f 146/136/79 100/137/79 101/148/79
f 144/139/80 98/140/80 99/141/80
f 23/3/81 143/144/81 138/143/81
f 5/153/1 6/1/1 7/3/1
f 9/5/2 7/4/2 10/2/2
f 9/153/3 10/1/3 11/3/3
f 11/153/4 12/1/4 13/3/4
f 15/5/5 13/4/5 16/2/5
f 15/4/6 16/1/6 17/5/6
f 19/5/7 17/4/7 20/2/7
f 19/4/8 20/1/8 21/5/8
f 10/8/9 8/154/9 6/155/9
f 6/155/9 24/156/9 22/6/9
f 22/6/9 20/157/9 18/158/9
f 18/158/9 16/159/9 14/160/9
f 14/160/9 12/7/9 22/6/9
f 10/8/9 6/155/9 22/6/9
f 22/6/9 18/158/9 14/160/9
f 5/5/10 23/4/10 6/2/10
f 21/153/11 22/1/11 23/3/11
f 46/161/12 27/9/12 45/11/12
f 44/162/8 43/12/8 30/14/8
f 42/163/3 41/15/3 32/17/3
f 47/164/13 30/18/13 48/20/13
f 31/165/9 40/23/9 48/22/9
f 36/21/9 32/166/9 48/22/9
f 41/26/14 29/167/14 1/168/14
f 1/168/14 2/24/14 41/26/14
f 44/29/15 26/169/15 4/170/15
f 4/170/15 3/27/15 44/29/15
f 47/32/16 30/171/16 3/172/16
f 3/172/16 1/30/16 47/32/16
f 45/35/17 26/173/17 37/39/17
f 37/39/17 33/33/17 45/35/17
f 46/36/9 28/174/9 34/37/9
f 38/38/9 27/46/9 46/36/9
f 30/175/17 39/41/17 44/40/17
f 37/39/17 26/173/17 44/40/17
f 28/176/3 25/42/3 42/44/3
f 38/38/9 40/23/9 43/45/9
f 31/165/9 43/45/9 40/23/9
f 39/65/3 40/47/3 37/49/3
f 26/177/8 27/50/8 44/52/8
f 28/174/9 42/53/9 34/37/9
f 32/166/9 36/21/9 42/53/9
f 33/33/17 35/68/17 41/54/17
f 29/178/17 41/54/17 35/68/17
f 36/66/8 35/55/8 34/57/8
f 28/179/12 46/58/12 25/60/12
f 33/180/13 37/49/13 34/61/13
f 29/181/13 47/62/13 32/64/13
f 40/47/12 39/65/12 36/66/12
f 29/178/17 35/68/17 47/67/17
f 39/41/17 30/175/17 47/67/17
f 63/182/18 64/69/18 30/71/18
f 43/183/13 50/72/13 44/74/13
f 27/184/19 52/75/19 26/77/19
f 46/185/8 54/78/8 45/80/8
f 28/186/18 56/81/18 25/83/18
f 32/187/20 60/84/20 29/86/20
f 61/188/8 62/87/8 47/89/8
f 42/189/12 58/90/12 41/92/12
f 45/95/21 25/190/21 2/191/21
f 2/191/21 4/93/21 45/95/21
f 69/101/17 70/96/17 65/98/17
f 70/96/3 71/99/3 66/97/3
f 72/192/8 69/101/8 68/102/8
f 65/98/13 66/97/13 68/104/13
f 72/193/12 71/105/12 69/101/12
f 77/111/17 78/106/17 73/108/17
f 78/106/3 79/109/3 74/107/3
f 80/194/8 77/111/8 76/112/8
f 73/108/13 74/107/13 76/114/13
f 80/195/12 79/115/12 77/111/12
f 85/121/17 86/116/17 81/118/17
f 86/116/3 87/119/3 82/117/3
f 88/196/8 85/121/8 84/122/8
f 81/118/13 82/117/13 84/124/13
f 88/197/12 87/125/12 85/121/12
f 93/131/17 94/126/17 89/128/17
f 94/126/3 95/129/3 90/127/3
f 96/198/8 93/131/8 92/132/8
f 89/128/13 90/127/13 92/134/13
f 96/199/12 95/135/12 93/131/12
f 101/149/22 100/136/22 107/138/22
f 99/142/23 98/139/23 105/141/23
f 106/137/24 100/136/24 105/141/24
f 98/139/25 97/143/25 104/140/25
f 105/145/26 104/139/26 110/141/26
f 106/147/27 105/145/27 111/146/27
f 104/139/28 103/143/28 109/140/28
f 107/149/29 106/147/29 112/148/29
f 111/136/30 110/142/30 116/137/30
f 109/139/31 108/143/31 114/140/31
f 112/149/32 111/136/32 117/148/32
f 115/141/33 110/142/33 114/140/33
f 119/140/34 114/139/34 118/144/34
f 117/149/35 116/136/35 122/138/35
f 115/142/36 114/139/36 120/141/36
f 116/136/37 115/142/37 121/137/37
f 127/138/38 122/149/38 126/137/38
f 120/142/39 119/139/39 125/141/39
f 121/136/40 120/142/40 126/137/40
f 119/139/41 118/143/41 124/140/41
f 126/136/42 125/142/42 131/137/42
f 124/150/43 123/143/43 129/140/43
f 127/149/44 126/136/44 132/138/44
f 130/141/45 125/142/45 129/140/45
f 136/137/46 131/136/46 135/141/46
f 129/139/47 128/143/47 134/140/47
f 132/149/48 131/136/48 137/138/48
f 130/142/49 129/139/49 135/141/49
f 137/149/50 136/136/50 142/148/50
f 140/141/51 135/142/51 139/140/51
f 141/137/52 136/136/52 140/141/52
f 134/139/53 133/143/53 139/140/53
f 147/148/54 142/149/54 146/137/54
f 145/141/55 140/142/55 144/140/55
f 141/136/56 140/142/56 146/137/56
f 139/139/57 138/143/57 144/140/57
f 5/5/61 97/144/61 23/4/61
f 97/143/62 5/153/62 103/144/62
f 7/4/64 9/5/64 103/143/64
f 11/3/66 113/144/66 9/153/66
f 11/153/69 13/3/69 113/143/69
f 13/4/70 15/5/70 118/143/70
f 15/4/72 17/5/72 123/143/72
f 17/4/74 19/5/74 128/143/74
f 146/136/76 145/142/76 100/137/76
f 144/139/77 143/143/77 98/140/77
f 19/4/78 21/5/78 133/143/78
f 147/149/79 146/136/79 101/148/79
f 145/142/80 144/139/80 99/141/80
f 21/153/81 23/3/81 138/143/81

File diff suppressed because it is too large Load Diff

View File

@ -1,504 +0,0 @@
# Blender v2.76 (sub 0) OBJ File: 'IvyMike.blend'
# www.blender.org
o Circle
v 0.000000 0.000000 -0.900000
v -0.344415 0.000000 -0.831492
v -0.636396 0.000000 -0.636396
v -0.831492 0.000000 -0.344415
v -0.900000 0.000000 0.000000
v -0.831492 0.000000 0.344415
v -0.636396 0.000000 0.636396
v -0.344415 0.000000 0.831492
v -0.000000 0.000000 0.900000
v 0.344415 0.000000 0.831492
v 0.636396 0.000000 0.636396
v 0.831492 0.000000 0.344415
v 0.900000 0.000000 -0.000000
v 0.831491 0.000000 -0.344415
v 0.636396 0.000000 -0.636396
v 0.344415 0.000000 -0.831492
v 0.000000 0.200000 -1.000000
v 0.000000 5.200000 -1.000000
v 0.382683 0.200000 -0.923880
v 0.382683 5.200000 -0.923880
v 0.707107 0.200000 -0.707107
v 0.707107 5.200000 -0.707107
v 0.923880 0.200000 -0.382683
v 0.923880 5.200000 -0.382683
v 1.000000 0.200000 0.000000
v 1.000000 5.200000 0.000000
v 0.923880 0.200000 0.382684
v 0.923880 5.200000 0.382684
v 0.707107 0.200000 0.707107
v 0.707107 5.200000 0.707107
v 0.382683 0.200000 0.923880
v 0.382683 5.200000 0.923880
v 0.000000 0.200000 1.000000
v 0.000000 5.200000 1.000000
v -0.382683 0.200000 0.923880
v -0.382683 5.200000 0.923880
v -0.707107 0.200000 0.707107
v -0.707107 5.200000 0.707107
v -0.923880 0.200000 0.382684
v -0.923880 5.200000 0.382684
v -1.000000 0.200000 -0.000000
v -1.000000 5.200000 -0.000000
v -0.923879 0.200000 -0.382684
v -0.923879 5.200000 -0.382684
v -0.707107 0.200000 -0.707107
v -0.707107 5.200000 -0.707107
v -0.382683 0.200000 -0.923880
v -0.382683 5.200000 -0.923880
v 0.000000 5.800000 -0.900000
v -0.344415 5.800000 -0.831492
v -0.636396 5.800000 -0.636396
v -0.831492 5.800000 -0.344415
v -0.900000 5.800000 0.000000
v -0.831492 5.800000 0.344415
v -0.636396 5.800000 0.636396
v -0.344415 5.800000 0.831492
v -0.000000 5.800000 0.900000
v 0.344415 5.800000 0.831492
v 0.636396 5.800000 0.636396
v 0.831492 5.800000 0.344415
v 0.900000 5.800000 -0.000000
v 0.831491 5.800000 -0.344415
v 0.636396 5.800000 -0.636396
v 0.344415 5.800000 -0.831492
v 0.000000 5.800000 -1.000000
v -0.382683 5.800000 -0.923880
v -0.707107 5.800000 -0.707107
v -0.923880 5.800000 -0.382683
v -1.000000 5.800000 0.000000
v -0.923880 5.800000 0.382684
v -0.707107 5.800000 0.707107
v -0.382683 5.800000 0.923880
v -0.000000 5.800000 1.000000
v 0.382683 5.800000 0.923880
v 0.707107 5.800000 0.707107
v 0.923880 5.800000 0.382684
v 1.000000 5.800000 -0.000000
v 0.923879 5.800000 -0.382684
v 0.707107 5.800000 -0.707107
v 0.382683 5.800000 -0.923880
v 0.600000 1.900000 1.100000
v 0.600000 1.900000 0.500000
v -0.600000 1.900000 0.500000
v -0.600000 1.900000 1.100000
v 0.600000 1.100000 1.100000
v 0.600000 1.100000 0.500000
v -0.600000 1.100000 0.500000
v -0.600000 1.100000 1.100000
v 0.000000 6.000000 0.000000
vt 0.617150 0.518932
vt 0.579584 0.518932
vt 0.579586 0.037535
vt 0.542018 0.518932
vt 0.542019 0.037534
vt 0.504451 0.518932
vt 0.504453 0.037534
vt 0.466885 0.518932
vt 0.466886 0.037534
vt 0.429318 0.518932
vt 0.429320 0.037534
vt 0.391752 0.518932
vt 0.391753 0.037534
vt 0.354185 0.518931
vt 0.354186 0.037534
vt 0.316619 0.518931
vt 0.316620 0.037534
vt 0.279052 0.518931
vt 0.279053 0.037534
vt 0.241486 0.518931
vt 0.241486 0.037534
vt 0.203920 0.518931
vt 0.203920 0.037534
vt 0.166353 0.518931
vt 0.166353 0.037533
vt 0.128787 0.518931
vt 0.128787 0.037533
vt 0.091220 0.518931
vt 0.091220 0.037533
vt 0.314740 0.577466
vt 0.280931 0.577466
vt 0.053654 0.518931
vt 0.016087 0.518931
vt 0.016087 0.037534
vt 0.053653 0.037533
vt 0.782454 0.173122
vt 0.662264 0.149215
vt 0.686172 0.029025
vt 0.427441 0.016087
vt 0.465008 0.016087
vt 0.468765 0.016087
vt 0.502575 0.016087
vt 0.506331 0.016087
vt 0.540141 0.016088
vt 0.543898 0.016088
vt 0.577708 0.016088
vt 0.581464 0.016088
vt 0.615274 0.016088
vt 0.617153 0.037535
vt 0.017965 0.016087
vt 0.051775 0.016087
vt 0.055532 0.016087
vt 0.089342 0.016087
vt 0.093098 0.016087
vt 0.126908 0.016087
vt 0.130665 0.016087
vt 0.164475 0.016087
vt 0.202042 0.016087
vt 0.239608 0.016087
vt 0.277175 0.016087
vt 0.314741 0.016087
vt 0.352308 0.016087
vt 0.389875 0.016087
vt 0.352307 0.577466
vt 0.318497 0.577466
vt 0.389873 0.577466
vt 0.427440 0.577466
vt 0.393630 0.577466
vt 0.465006 0.577466
vt 0.502573 0.577466
vt 0.468763 0.577466
vt 0.540139 0.577466
vt 0.577706 0.577467
vt 0.543896 0.577467
vt 0.615272 0.577467
vt 0.581462 0.577467
vt 0.051776 0.577466
vt 0.017966 0.577466
vt 0.089342 0.577466
vt 0.055532 0.577466
vt 0.126908 0.577466
vt 0.093099 0.577466
vt 0.164475 0.577466
vt 0.130665 0.577466
vt 0.202041 0.577466
vt 0.168231 0.577466
vt 0.239608 0.577466
vt 0.277174 0.577466
vt 0.116571 0.796777
vt 0.106943 0.796777
vt 0.114272 0.759932
vt 0.123167 0.763617
vt 0.135143 0.728697
vt 0.170063 0.716721
vt 0.141951 0.735505
vt 0.166378 0.707826
vt 0.203223 0.700497
vt 0.203223 0.710125
vt 0.240068 0.707826
vt 0.236383 0.716721
vt 0.271303 0.728697
vt 0.264495 0.735505
vt 0.292174 0.759932
vt 0.283279 0.763617
vt 0.299503 0.796777
vt 0.289875 0.796777
vt 0.292174 0.833621
vt 0.264495 0.858049
vt 0.283279 0.829937
vt 0.271303 0.864857
vt 0.240068 0.885728
vt 0.203223 0.883429
vt 0.236383 0.876833
vt 0.203223 0.893056
vt 0.166379 0.885728
vt 0.123167 0.829937
vt 0.114272 0.833621
vt 0.141951 0.858049
vt 0.135143 0.864857
vt 0.170063 0.876833
vt 0.595837 0.802200
vt 0.480301 0.802200
vt 0.480301 0.744432
vt 0.240447 0.983913
vt 0.165999 0.983913
vt 0.097219 0.955423
vt 0.044577 0.902781
vt 0.016087 0.834001
vt 0.016087 0.759553
vt 0.044576 0.690772
vt 0.097219 0.638130
vt 0.165999 0.609640
vt 0.480301 0.609640
vt 0.595836 0.609640
vt 0.595836 0.667408
vt 0.480301 0.667408
vt 0.595837 0.744432
vt 0.653604 0.667408
vt 0.422533 0.744432
vt 0.422533 0.667408
vt 0.390360 0.834001
vt 0.361870 0.902781
vt 0.390360 0.759553
vt 0.361870 0.690772
vt 0.309227 0.638130
vt 0.309227 0.955423
vt 0.240447 0.609640
vt 0.717408 0.016087
vt 0.751218 0.016087
vt 0.782454 0.029025
vt 0.806361 0.052932
vt 0.819300 0.084168
vt 0.819300 0.117978
vt 0.806361 0.149215
vt 0.751218 0.186060
vt 0.717408 0.186060
vt 0.686172 0.173122
vt 0.649326 0.117978
vt 0.649326 0.084168
vt 0.662264 0.052932
vt 0.393631 0.016087
vt 0.431198 0.016087
vt 0.168232 0.016087
vt 0.205798 0.016087
vt 0.243365 0.016087
vt 0.280931 0.016087
vt 0.318498 0.016087
vt 0.356065 0.016087
vt 0.356064 0.577466
vt 0.431196 0.577466
vt 0.506329 0.577466
vt 0.205798 0.577466
vt 0.243364 0.577466
vt 0.653604 0.744432
vn 0.195100 0.000000 -0.980800
vn 0.555600 0.000000 -0.831500
vn 0.831500 0.000000 -0.555600
vn 0.980800 0.000000 -0.195100
vn 0.980800 0.000000 0.195100
vn 0.831500 0.000000 0.555600
vn 0.555600 0.000000 0.831500
vn 0.195100 0.000000 0.980800
vn -0.195100 0.000000 0.980800
vn -0.555600 0.000000 0.831500
vn -0.831500 0.000000 0.555600
vn -0.980800 0.000000 0.195100
vn -0.980800 0.000000 -0.195100
vn -0.831500 0.000000 -0.555600
vn -0.192500 0.161300 0.967900
vn -0.195100 0.000000 -0.980800
vn -0.555600 0.000000 -0.831500
vn 0.000000 -1.000000 0.000000
vn 0.746500 -0.440300 0.498800
vn 0.880600 -0.440300 0.175200
vn 0.880600 -0.440300 -0.175200
vn 0.746500 -0.440300 -0.498800
vn 0.498800 -0.440300 -0.746500
vn 0.175200 -0.440300 -0.880600
vn -0.175200 -0.440300 -0.880600
vn -0.498800 -0.440300 -0.746500
vn -0.746500 -0.440300 -0.498800
vn -0.880600 -0.440300 -0.175200
vn -0.880600 -0.440300 0.175200
vn -0.746500 -0.440300 0.498800
vn -0.498800 -0.440300 0.746500
vn -0.175200 -0.440300 0.880600
vn 0.175200 -0.440300 0.880600
vn 0.498800 -0.440300 0.746500
vn 0.192500 0.161300 0.967900
vn 0.548300 0.161300 0.820600
vn 0.820600 0.161300 0.548300
vn 0.967900 0.161300 0.192500
vn 0.967900 0.161300 -0.192500
vn 0.820600 0.161300 -0.548300
vn 0.548300 0.161300 -0.820600
vn 0.192500 0.161300 -0.967900
vn -0.192500 0.161300 -0.967900
vn -0.548300 0.161300 -0.820600
vn -0.820600 0.161300 -0.548300
vn -0.967900 0.161300 -0.192500
vn -0.967900 0.161300 0.192500
vn -0.820600 0.161300 0.548300
vn -0.548300 0.161300 0.820600
vn 0.000000 1.000000 0.000000
vn 0.039000 0.979800 0.196000
vn -0.039000 0.979800 0.196000
vn -0.111000 0.979800 0.166100
vn -0.166100 0.979800 0.111000
vn -0.196000 0.979800 0.039000
vn -0.196000 0.979800 -0.039000
vn -0.166100 0.979800 -0.111000
vn -0.111000 0.979800 -0.166100
vn -0.039000 0.979800 -0.196000
vn 0.000000 0.000000 1.000000
vn 1.000000 0.000000 0.000000
vn -1.000000 0.000000 0.000000
vn 0.196000 0.979800 0.039000
vn 0.166100 0.979800 0.111000
vn 0.196000 0.979800 -0.039000
vn 0.166100 0.979800 -0.111000
vn 0.111000 0.979800 -0.166100
vn 0.111000 0.979800 0.166100
vn 0.039000 0.979800 -0.196000
s off
f 18/1/1 20/2/1 19/3/1
f 20/2/2 22/4/2 21/5/2
f 22/4/3 24/6/3 23/7/3
f 24/6/4 26/8/4 25/9/4
f 26/8/5 28/10/5 27/11/5
f 28/10/6 30/12/6 29/13/6
f 30/12/7 32/14/7 31/15/7
f 32/14/8 34/16/8 33/17/8
f 34/16/9 36/18/9 35/19/9
f 36/18/10 38/20/10 37/21/10
f 38/20/11 40/22/11 39/23/11
f 40/22/12 42/24/12 41/25/12
f 42/24/13 44/26/13 43/27/13
f 44/26/14 46/28/14 45/29/14
f 34/16/15 57/30/15 56/31/15
f 48/32/16 18/33/16 17/34/16
f 46/28/17 48/32/17 47/35/17
f 11/36/18 7/37/18 3/38/18
f 12/39/19 27/11/19 29/13/19
f 13/40/20 25/9/20 27/11/20
f 13/41/21 14/42/21 23/7/21
f 14/43/22 15/44/22 21/5/22
f 15/45/23 16/46/23 19/3/23
f 16/47/24 1/48/24 17/49/24
f 1/50/25 2/51/25 47/35/25
f 2/52/26 3/53/26 45/29/26
f 3/54/27 4/55/27 43/27/27
f 4/56/28 5/57/28 41/25/28
f 6/58/29 39/23/29 41/25/29
f 7/59/30 37/21/30 39/23/30
f 8/60/31 35/19/31 37/21/31
f 9/61/32 33/17/32 35/19/32
f 10/62/33 31/15/33 33/17/33
f 11/63/34 29/13/34 31/15/34
f 32/14/35 58/64/35 57/65/35
f 32/14/36 30/12/36 59/66/36
f 28/10/37 60/67/37 59/68/37
f 28/10/38 26/8/38 61/69/38
f 24/6/39 62/70/39 61/71/39
f 24/6/40 22/4/40 63/72/40
f 20/2/41 64/73/41 63/74/41
f 18/1/42 49/75/42 64/76/42
f 48/32/43 50/77/43 49/78/43
f 46/28/44 51/79/44 50/80/44
f 44/26/45 52/81/45 51/82/45
f 42/24/46 53/83/46 52/84/46
f 40/22/47 54/85/47 53/86/47
f 40/22/48 38/20/48 55/87/48
f 38/20/49 36/18/49 56/88/49
f 53/89/18 69/90/18 68/91/18
f 52/92/18 68/91/18 67/93/18
f 50/94/18 51/95/18 67/93/18
f 50/94/18 66/96/18 65/97/18
f 49/98/18 65/97/18 80/99/18
f 64/100/18 80/99/18 79/101/18
f 63/102/18 79/101/18 78/103/18
f 62/104/18 78/103/18 77/105/18
f 61/106/18 77/105/18 76/107/18
f 59/108/18 60/109/18 76/107/18
f 59/108/18 75/110/18 74/111/18
f 57/112/18 58/113/18 74/111/18
f 57/112/18 73/114/18 72/115/18
f 53/89/18 54/116/18 70/117/18
f 55/118/18 71/119/18 70/117/18
f 56/120/18 72/115/18 71/119/18
f 82/121/50 83/122/50 84/123/50
f 73/114/51 74/111/51 89/124/51
f 72/115/52 73/114/52 89/125/52
f 71/119/53 72/115/53 89/126/53
f 70/117/54 71/119/54 89/127/54
f 69/90/55 70/117/55 89/128/55
f 68/91/56 69/90/56 89/129/56
f 67/93/57 68/91/57 89/130/57
f 66/96/58 67/93/58 89/131/58
f 65/97/59 66/96/59 89/132/59
f 87/133/18 86/134/18 85/135/18
f 84/123/60 88/136/60 85/135/60
f 81/137/61 85/135/61 86/138/61
f 83/139/62 87/140/62 88/136/62
f 76/107/63 77/105/63 89/141/63
f 75/110/64 76/107/64 89/142/64
f 77/105/65 78/103/65 89/143/65
f 78/103/66 79/101/66 89/144/66
f 80/99/67 89/145/67 79/101/67
f 74/111/68 75/110/68 89/146/68
f 80/99/69 65/97/69 89/147/69
f 17/49/1 18/1/1 19/3/1
f 19/3/2 20/2/2 21/5/2
f 21/5/3 22/4/3 23/7/3
f 23/7/4 24/6/4 25/9/4
f 25/9/5 26/8/5 27/11/5
f 27/11/6 28/10/6 29/13/6
f 29/13/7 30/12/7 31/15/7
f 31/15/8 32/14/8 33/17/8
f 33/17/9 34/16/9 35/19/9
f 35/19/10 36/18/10 37/21/10
f 37/21/11 38/20/11 39/23/11
f 39/23/12 40/22/12 41/25/12
f 41/25/13 42/24/13 43/27/13
f 43/27/14 44/26/14 45/29/14
f 36/18/15 34/16/15 56/31/15
f 47/35/16 48/32/16 17/34/16
f 45/29/17 46/28/17 47/35/17
f 3/38/18 2/148/18 1/149/18
f 1/149/18 16/150/18 15/151/18
f 15/151/18 14/152/18 13/153/18
f 13/153/18 12/154/18 11/36/18
f 11/36/18 10/155/18 9/156/18
f 9/156/18 8/157/18 7/37/18
f 7/37/18 6/158/18 5/159/18
f 5/159/18 4/160/18 3/38/18
f 3/38/18 1/149/18 15/151/18
f 15/151/18 13/153/18 3/38/18
f 11/36/18 9/156/18 7/37/18
f 7/37/18 5/159/18 3/38/18
f 3/38/18 13/153/18 11/36/18
f 11/161/19 12/39/19 29/13/19
f 12/162/20 13/40/20 27/11/20
f 25/9/21 13/41/21 23/7/21
f 23/7/22 14/43/22 21/5/22
f 21/5/23 15/45/23 19/3/23
f 19/3/24 16/47/24 17/49/24
f 17/34/25 1/50/25 47/35/25
f 47/35/26 2/52/26 45/29/26
f 45/29/27 3/54/27 43/27/27
f 43/27/28 4/56/28 41/25/28
f 5/163/29 6/58/29 41/25/29
f 6/164/30 7/59/30 39/23/30
f 7/165/31 8/60/31 37/21/31
f 8/166/32 9/61/32 35/19/32
f 9/167/33 10/62/33 33/17/33
f 10/168/34 11/63/34 31/15/34
f 34/16/35 32/14/35 57/65/35
f 58/169/36 32/14/36 59/66/36
f 30/12/37 28/10/37 59/68/37
f 60/170/38 28/10/38 61/69/38
f 26/8/39 24/6/39 61/71/39
f 62/171/40 24/6/40 63/72/40
f 22/4/41 20/2/41 63/74/41
f 20/2/42 18/1/42 64/76/42
f 18/33/43 48/32/43 49/78/43
f 48/32/44 46/28/44 50/80/44
f 46/28/45 44/26/45 51/82/45
f 44/26/46 42/24/46 52/84/46
f 42/24/47 40/22/47 53/86/47
f 54/172/48 40/22/48 55/87/48
f 55/173/49 38/20/49 56/88/49
f 52/92/18 53/89/18 68/91/18
f 51/95/18 52/92/18 67/93/18
f 66/96/18 50/94/18 67/93/18
f 49/98/18 50/94/18 65/97/18
f 64/100/18 49/98/18 80/99/18
f 63/102/18 64/100/18 79/101/18
f 62/104/18 63/102/18 78/103/18
f 61/106/18 62/104/18 77/105/18
f 60/109/18 61/106/18 76/107/18
f 75/110/18 59/108/18 76/107/18
f 58/113/18 59/108/18 74/111/18
f 73/114/18 57/112/18 74/111/18
f 56/120/18 57/112/18 72/115/18
f 69/90/18 53/89/18 70/117/18
f 54/116/18 55/118/18 70/117/18
f 55/118/18 56/120/18 71/119/18
f 81/137/50 82/121/50 84/123/50
f 88/136/18 87/133/18 85/135/18
f 81/137/60 84/123/60 85/135/60
f 82/174/61 81/137/61 86/138/61
f 84/123/62 83/139/62 88/136/62

View File

@ -1,302 +0,0 @@
# Blender v2.76 (sub 0) OBJ File: 'launchpad.blend'
# www.blender.org
o Cylinder
v 1.060660 0.250000 -1.060660
v 0.000000 0.500000 -1.000000
v 1.500000 0.250000 0.000000
v 0.707107 0.500000 -0.707107
v 1.060660 0.250000 1.060660
v 1.000000 0.500000 0.000000
v -0.000000 0.250000 1.500000
v 0.707107 0.500000 0.707107
v -1.060660 0.250000 1.060660
v -0.000000 0.500000 1.000000
v 0.000000 0.250000 -1.500000
v -0.707107 0.500000 0.707107
v -1.060660 0.250000 -1.060660
v -1.000000 0.500000 -0.000000
v -1.500000 0.250000 -0.000000
v -0.707107 0.500000 -0.707107
v 0.000000 0.250000 -1.000000
v 0.707107 0.250000 -0.707107
v 1.000000 0.250000 0.000000
v 0.707107 0.250000 0.707107
v -0.000000 0.250000 1.000000
v -0.707107 0.250000 0.707107
v -1.000000 0.250000 -0.000000
v -0.707107 0.250000 -0.707107
v 0.000000 0.000000 -1.500000
v 1.060660 0.000000 -1.060660
v 1.500000 0.000000 0.000000
v 1.060660 0.000000 1.060660
v -0.000000 0.000000 1.500000
v -1.060660 0.000000 1.060660
v -1.500000 0.000000 -0.000000
v -1.060660 0.000000 -1.060660
v -0.500000 0.000000 2.000000
v 0.500000 0.000000 2.000000
v -0.500000 0.000000 -2.000000
v 0.500000 0.000000 -2.000000
v -0.500000 0.125000 -2.000000
v 0.500000 0.125000 -2.000000
v -0.500000 0.475000 -0.750000
v 0.500000 0.475000 -0.750000
v -0.500000 0.475000 0.750000
v 0.500000 0.475000 0.750000
v 0.500000 0.125000 2.000000
v -0.500000 0.125000 2.000000
v -0.500000 0.100000 0.750000
v 0.500000 0.100000 0.750000
v -0.500000 0.100000 -0.750000
v 0.500000 0.100000 -0.750000
v 2.000000 0.000000 0.500000
v 2.000000 0.000000 -0.500000
v -2.000000 0.000000 0.500000
v -2.000000 0.000000 -0.500000
v -2.000000 0.125000 0.500000
v -2.000000 0.125000 -0.500000
v -0.750000 0.475000 0.500000
v -0.750000 0.475000 -0.500000
v 0.750000 0.475000 0.500000
v 0.750000 0.475000 -0.500000
v 2.000000 0.125000 -0.500000
v 2.000000 0.125000 0.500000
v 0.750000 0.100000 0.500000
v 0.750000 0.100000 -0.500000
v -0.750000 0.100000 0.500000
v -0.750000 0.100000 -0.500000
vt 0.679427 0.603288
vt 0.736986 0.545729
vt 0.755787 0.564530
vt 0.736986 0.464329
vt 0.763575 0.464329
vt 0.679428 0.406770
vt 0.698229 0.387969
vt 0.598027 0.406770
vt 0.598027 0.380181
vt 0.540468 0.464329
vt 0.521667 0.445528
vt 0.540468 0.545729
vt 0.513879 0.545729
vt 0.598027 0.603288
vt 0.679427 0.629877
vt 0.579226 0.622089
vt 0.371403 0.064091
vt 0.370621 0.122777
vt 0.246818 0.069553
vt 0.028468 0.292851
vt 0.071192 0.251063
vt 0.122297 0.378412
vt 0.289175 0.473320
vt 0.246967 0.432446
vt 0.370760 0.378824
vt 0.456943 0.213084
vt 0.412191 0.251217
vt 0.204262 0.028468
vt 0.122271 0.123726
vt 0.028468 0.209288
vt 0.062521 0.124396
vt 0.121333 0.437581
vt 0.143605 0.355918
vt 0.245661 0.401664
vt 0.429011 0.374227
vt 0.552285 0.820181
vt 0.552285 0.686813
vt 0.658640 0.686813
vt 0.346906 0.359230
vt 0.145516 0.144219
vt 0.102263 0.249691
vt 0.382068 0.252292
vt 0.248398 0.100332
vt 0.348830 0.144590
vt 0.898743 0.686813
vt 0.898743 0.820181
vt 0.792388 0.820181
vt 0.658640 0.971532
vt 0.552285 0.971532
vt 0.552285 0.833475
vt 0.898743 0.833475
vt 0.792388 0.833475
vt 0.898743 0.971532
vt 0.658640 0.833475
vt 0.792388 0.971532
vt 0.753982 0.960778
vt 0.937149 0.960778
vt 0.513879 0.960778
vt 0.539483 0.829891
vt 0.671442 0.829891
vt 0.697046 0.960778
vt 0.413332 0.663908
vt 0.306977 0.663908
vt 0.306977 0.530539
vt 0.066874 0.530539
vt 0.173229 0.530539
vt 0.173229 0.663908
vt 0.413332 0.815259
vt 0.306977 0.815259
vt 0.306977 0.677202
vt 0.066874 0.663908
vt 0.173229 0.677202
vt 0.066874 0.815259
vt 0.066874 0.677202
vt 0.413332 0.677202
vt 0.028468 0.804505
vt 0.211635 0.804505
vt 0.173229 0.815259
vt 0.268571 0.804505
vt 0.294175 0.673617
vt 0.426134 0.673617
vt 0.451738 0.804505
vt 0.722318 0.323245
vt 0.513879 0.236907
vt 0.600218 0.028468
vt 0.698228 0.622089
vt 0.763575 0.545729
vt 0.755787 0.445528
vt 0.679428 0.380181
vt 0.579226 0.387969
vt 0.513880 0.464329
vt 0.598027 0.629877
vt 0.521667 0.564530
vt 0.288867 0.028609
vt 0.062538 0.377750
vt 0.371704 0.437572
vt 0.429230 0.127457
vt 0.121231 0.064583
vt 0.204447 0.473603
vt 0.456631 0.289155
vt 0.658640 0.820181
vt 0.792388 0.686813
vt 0.779586 0.829891
vt 0.911545 0.829891
vt 0.413332 0.530539
vt 0.054072 0.673618
vt 0.186031 0.673618
vt 0.722318 0.028468
vt 0.808657 0.114806
vt 0.808657 0.236907
vt 0.600218 0.323245
vt 0.513879 0.114806
vn 0.382700 0.000000 -0.923900
vn 0.923900 0.000000 -0.382700
vn 0.923900 0.000000 0.382700
vn 0.382700 0.000000 0.923900
vn -0.382700 0.000000 0.923900
vn -0.923900 0.000000 0.382700
vn 0.000000 1.000000 -0.000000
vn -0.382700 0.000000 -0.923900
vn -0.923900 0.000000 -0.382700
vn 0.000000 -0.996800 0.079700
vn 0.000000 -0.996800 -0.079700
vn 0.000000 0.963000 -0.269600
vn 0.000000 0.000000 1.000000
vn 0.000000 0.963000 0.269600
vn 0.000000 0.000000 -1.000000
vn -1.000000 0.000000 0.000000
vn 1.000000 0.000000 0.000000
vn 0.079700 -0.996800 0.000000
vn -0.079700 -0.996800 -0.000000
vn -0.269600 0.963000 -0.000000
vn 0.269600 0.963000 0.000000
vn 0.000000 -1.000000 0.000000
s off
f 2/1/1 4/2/1 18/3/1
f 4/2/2 6/4/2 19/5/2
f 6/4/3 8/6/3 20/7/3
f 8/6/4 10/8/4 21/9/4
f 10/8/5 12/10/5 22/11/5
f 12/10/6 14/12/6 23/13/6
f 14/12/7 8/6/7 6/4/7
f 16/14/8 2/1/8 17/15/8
f 14/12/9 16/14/9 24/16/9
f 17/17/7 11/18/7 13/19/7
f 22/20/7 9/21/7 7/22/7
f 20/23/7 5/24/7 3/25/7
f 18/26/7 1/27/7 11/18/7
f 24/28/7 13/19/7 15/29/7
f 22/30/7 23/31/7 15/29/7
f 21/32/7 7/22/7 5/24/7
f 7/22/4 29/33/4 28/34/4
f 19/35/7 3/25/7 1/27/7
f 36/36/10 48/37/10 47/38/10
f 5/24/3 28/34/3 27/39/3
f 15/29/6 31/40/6 30/41/6
f 9/21/5 30/41/5 29/33/5
f 3/25/2 27/39/2 26/42/2
f 13/19/9 32/43/9 31/40/9
f 1/27/1 26/42/1 25/44/1
f 11/18/8 25/44/8 32/43/8
f 46/45/11 34/46/11 33/47/11
f 39/48/12 40/49/12 38/50/12
f 33/47/13 34/46/13 43/51/13
f 44/52/14 43/51/14 42/53/14
f 37/54/15 38/50/15 36/36/15
f 44/52/16 41/55/16 45/56/16
f 46/57/17 42/53/17 43/51/17
f 48/58/17 36/59/17 38/50/17
f 37/54/16 35/60/16 47/61/16
f 51/62/18 52/63/18 64/64/18
f 61/65/19 62/66/19 50/67/19
f 55/68/20 56/69/20 54/70/20
f 49/71/17 50/67/17 59/72/17
f 57/73/21 60/74/21 59/72/21
f 53/75/16 54/70/16 52/63/16
f 60/74/13 57/73/13 61/76/13
f 62/77/15 58/78/15 59/72/15
f 64/79/15 52/80/15 54/70/15
f 53/75/13 51/81/13 63/82/13
f 28/83/22 30/84/22 32/85/22
f 17/86/1 2/1/1 18/3/1
f 18/87/2 4/2/2 19/5/2
f 19/88/3 6/4/3 20/7/3
f 20/89/4 8/6/4 21/9/4
f 21/90/5 10/8/5 22/11/5
f 22/91/6 12/10/6 23/13/6
f 6/4/7 4/2/7 2/1/7
f 2/1/7 16/14/7 6/4/7
f 14/12/7 12/10/7 10/8/7
f 10/8/7 8/6/7 14/12/7
f 6/4/7 16/14/7 14/12/7
f 24/92/8 16/14/8 17/15/8
f 23/93/9 14/12/9 24/16/9
f 24/94/7 17/17/7 13/19/7
f 21/95/7 22/20/7 7/22/7
f 19/96/7 20/23/7 3/25/7
f 17/97/7 18/26/7 11/18/7
f 23/98/7 24/28/7 15/29/7
f 9/21/7 22/30/7 15/29/7
f 20/99/7 21/32/7 5/24/7
f 5/24/4 7/22/4 28/34/4
f 18/100/7 19/35/7 1/27/7
f 35/101/10 36/36/10 47/38/10
f 3/25/3 5/24/3 27/39/3
f 9/21/6 15/29/6 30/41/6
f 7/22/5 9/21/5 29/33/5
f 1/27/2 3/25/2 26/42/2
f 15/29/9 13/19/9 31/40/9
f 11/18/1 1/27/1 25/44/1
f 13/19/8 11/18/8 32/43/8
f 45/102/11 46/45/11 33/47/11
f 37/54/12 39/48/12 38/50/12
f 44/52/13 33/47/13 43/51/13
f 41/55/14 44/52/14 42/53/14
f 35/101/15 37/54/15 36/36/15
f 33/103/16 44/52/16 45/56/16
f 34/104/17 46/57/17 43/51/17
f 40/49/17 48/58/17 38/50/17
f 39/48/16 37/54/16 47/61/16
f 63/105/18 51/62/18 64/64/18
f 49/71/19 61/65/19 50/67/19
f 53/75/20 55/68/20 54/70/20
f 60/74/17 49/71/17 59/72/17
f 58/78/21 57/73/21 59/72/21
f 51/62/16 53/75/16 52/63/16
f 49/106/13 60/74/13 61/76/13
f 50/107/15 62/77/15 59/72/15
f 56/69/15 64/79/15 54/70/15
f 55/68/13 53/75/13 63/82/13
f 32/85/22 25/108/22 26/109/22
f 26/109/22 27/110/22 28/83/22
f 28/83/22 29/111/22 30/84/22
f 30/84/22 31/112/22 32/85/22
f 32/85/22 26/109/22 28/83/22

View File

@ -1,132 +0,0 @@
# Blender v2.76 (sub 0) OBJ File: ''
# www.blender.org
o Cone
v 0.000000 0.000000 -0.250000
v 0.095671 0.000000 -0.230970
v 0.176777 0.000000 -0.176777
v 0.230970 0.000000 -0.095671
v 0.250000 0.000000 0.000000
v 0.000000 1.000000 0.000000
v 0.230970 0.000000 0.095671
v 0.176777 0.000000 0.176777
v 0.095671 0.000000 0.230970
v 0.000000 0.000000 0.250000
v -0.095671 0.000000 0.230970
v -0.176777 0.000000 0.176777
v -0.230970 0.000000 0.095671
v -0.250000 0.000000 -0.000000
v -0.230970 0.000000 -0.095671
v -0.176777 0.000000 -0.176777
v -0.095671 0.000000 -0.230970
vt 0.604260 0.026082
vt 0.604260 0.474169
vt 0.562802 0.028089
vt 0.377812 0.973917
vt 0.398565 0.526333
vt 0.419317 0.973918
vt 0.419224 0.026082
vt 0.419224 0.474169
vt 0.377766 0.028089
vt 0.025530 0.739009
vt 0.046282 0.291425
vt 0.067035 0.739009
vt 0.470284 0.472162
vt 0.511742 0.026082
vt 0.511742 0.474169
vt 0.118094 0.739009
vt 0.138846 0.291425
vt 0.159599 0.739009
vt 0.840401 0.973416
vt 0.861154 0.525831
vt 0.881906 0.973416
vt 0.747837 0.973416
vt 0.768589 0.525831
vt 0.789342 0.973416
vt 0.285248 0.472162
vt 0.326707 0.026082
vt 0.326707 0.474169
vt 0.747837 0.473667
vt 0.768589 0.026082
vt 0.789342 0.473667
vt 0.655319 0.472162
vt 0.696778 0.026082
vt 0.696778 0.474169
vt 0.285248 0.973918
vt 0.306001 0.526333
vt 0.326753 0.973918
vt 0.562941 0.973918
vt 0.583693 0.526333
vt 0.604446 0.973918
vt 0.840401 0.473667
vt 0.861154 0.026082
vt 0.881906 0.473667
vt 0.932966 0.473667
vt 0.953718 0.026082
vt 0.974470 0.473667
vt 0.470377 0.973918
vt 0.491129 0.526333
vt 0.511882 0.973918
vt 0.218306 0.072293
vt 0.188957 0.223033
vt 0.070761 0.042310
vt 0.041413 0.193049
vt 0.025530 0.153873
vt 0.025530 0.111469
vt 0.041413 0.072293
vt 0.109107 0.026082
vt 0.150612 0.026082
vt 0.188957 0.042310
vt 0.234189 0.111469
vt 0.234189 0.153873
vt 0.218306 0.193049
vt 0.150612 0.239260
vt 0.109107 0.239260
vt 0.070761 0.223032
vn -0.539600 0.238100 -0.807500
vn 0.189500 0.238100 -0.952600
vn -0.807500 0.238100 -0.539600
vn -0.952600 0.238100 -0.189500
vn -0.952600 0.238100 0.189500
vn -0.807500 0.238100 0.539600
vn -0.539600 0.238100 0.807500
vn -0.189500 0.238100 0.952600
vn 0.189500 0.238100 0.952600
vn 0.539600 0.238100 0.807500
vn 0.807500 0.238100 0.539600
vn 0.952600 0.238100 0.189500
vn 0.952600 0.238100 -0.189500
vn 0.807500 0.238100 -0.539600
vn -0.189500 0.238100 -0.952600
vn 0.539600 0.238100 -0.807500
vn 0.000000 -1.000000 0.000000
s off
f 16/1/1 6/2/1 17/3/1
f 1/4/2 6/5/2 2/6/2
f 15/7/3 6/8/3 16/9/3
f 14/10/4 6/11/4 15/12/4
f 13/13/5 6/14/5 14/15/5
f 12/16/6 6/17/6 13/18/6
f 11/19/7 6/20/7 12/21/7
f 10/22/8 6/23/8 11/24/8
f 9/25/9 6/26/9 10/27/9
f 8/28/10 6/29/10 9/30/10
f 7/31/11 6/32/11 8/33/11
f 5/34/12 6/35/12 7/36/12
f 4/37/13 6/38/13 5/39/13
f 3/40/14 6/41/14 4/42/14
f 17/43/15 6/44/15 1/45/15
f 2/46/16 6/47/16 3/48/16
f 9/49/17 13/50/17 4/51/17
f 17/52/17 1/53/17 2/54/17
f 2/54/17 3/55/17 17/52/17
f 4/51/17 5/56/17 7/57/17
f 7/57/17 8/58/17 4/51/17
f 9/49/17 10/59/17 13/50/17
f 11/60/17 12/61/17 13/50/17
f 13/50/17 14/62/17 15/63/17
f 15/63/17 16/64/17 17/52/17
f 17/52/17 3/55/17 4/51/17
f 4/51/17 8/58/17 9/49/17
f 10/59/17 11/60/17 13/50/17
f 13/50/17 15/63/17 17/52/17
f 17/52/17 4/51/17 13/50/17

View File

@ -1,704 +0,0 @@
# Blender v2.70 (sub 0) OBJ File: 'Missile.blend'
# www.blender.org
o Cylinder
v -0.109738 3.500000 -0.551692
v -0.109738 3.750000 -0.551692
v 0.109738 3.500000 -0.551692
v 0.109738 3.750000 -0.551692
v 0.312508 3.500000 -0.467702
v 0.312508 3.750000 -0.467702
v 0.467702 3.500000 -0.312508
v 0.467702 3.750000 -0.312508
v 0.551692 3.500000 -0.109738
v 0.551692 3.750000 -0.109738
v 0.551692 3.500000 0.109738
v 0.551692 3.750000 0.109738
v 0.467702 3.500000 0.312508
v 0.467702 3.750000 0.312508
v 0.312508 3.500000 0.467702
v 0.312508 3.750000 0.467702
v 0.109738 3.500000 0.551692
v 0.109738 3.750000 0.551692
v -0.109738 3.500000 0.551692
v -0.109738 3.750000 0.551692
v -0.312508 3.500000 0.467702
v -0.312508 3.750000 0.467702
v -0.467702 3.500000 0.312508
v -0.467702 3.750000 0.312508
v -0.551692 3.500000 0.109738
v -0.551692 3.750000 0.109738
v -0.551692 3.500000 -0.109738
v -0.551692 3.750000 -0.109738
v -0.467702 3.500000 -0.312508
v -0.467702 3.750000 -0.312508
v -0.312508 3.500000 -0.467702
v -0.312508 3.750000 -0.467702
v -0.097545 1.000000 -0.490393
v -0.097545 3.500000 -0.490393
v 0.097545 1.000000 -0.490393
v 0.097545 3.500000 -0.490393
v 0.277785 1.000000 -0.415735
v 0.277785 3.500000 -0.415735
v 0.415735 1.000000 -0.277785
v 0.415735 3.500000 -0.277785
v 0.490393 1.000000 -0.097545
v 0.490393 3.500000 -0.097545
v 0.490393 1.000000 0.097545
v 0.490393 3.500000 0.097545
v 0.415735 1.000000 0.277785
v 0.415735 3.500000 0.277785
v 0.277785 1.000000 0.415735
v 0.277785 3.500000 0.415735
v 0.097545 1.000000 0.490393
v 0.097545 3.500000 0.490393
v -0.097545 1.000000 0.490393
v -0.097545 3.500000 0.490393
v -0.277785 1.000000 0.415735
v -0.277785 3.500000 0.415735
v -0.415735 1.000000 0.277785
v -0.415735 3.500000 0.277785
v -0.490393 1.000000 0.097545
v -0.490393 3.500000 0.097545
v -0.490393 1.000000 -0.097545
v -0.490393 3.500000 -0.097545
v -0.415735 1.000000 -0.277785
v -0.415735 3.500000 -0.277785
v -0.277785 1.000000 -0.415735
v -0.277785 3.500000 -0.415735
v -0.036579 4.750000 -0.183897
v 0.036580 4.750000 -0.183897
v 0.104169 4.750000 -0.155901
v 0.155901 4.750000 -0.104169
v 0.183897 4.750000 -0.036579
v 0.183897 4.750000 0.036579
v 0.155901 4.750000 0.104169
v 0.104170 4.750000 0.155901
v 0.036580 4.750000 0.183897
v -0.036579 4.750000 0.183897
v -0.104169 4.750000 0.155901
v -0.155901 4.750000 0.104169
v -0.183897 4.750000 0.036579
v -0.183897 4.750000 -0.036579
v -0.155900 4.750000 -0.104169
v -0.104169 4.750000 -0.155901
v -0.146318 0.000000 -0.735589
v 0.146318 0.000000 -0.735589
v 0.416678 0.000000 -0.623602
v 0.623602 0.000000 -0.416678
v 0.735589 0.000000 -0.146318
v 0.735589 0.000000 0.146318
v 0.623602 0.000000 0.416678
v 0.416678 0.000000 0.623602
v 0.146318 0.000000 0.735589
v -0.146318 0.000000 0.735589
v -0.416678 0.000000 0.623602
v -0.623602 0.000000 0.416678
v -0.735589 0.000000 0.146318
v -0.735589 0.000000 -0.146318
v -0.623602 0.000000 -0.416678
v -0.416678 0.000000 -0.623602
vt 0.406722 0.903820
vt 0.371027 0.903820
vt 0.371027 0.863107
vt 0.351511 0.964074
vt 0.315817 0.964074
vt 0.315817 0.923362
vt 0.935031 0.050484
vt 0.899337 0.050484
vt 0.899337 0.009771
vt 0.045453 0.943524
vt 0.009758 0.943524
vt 0.009758 0.902811
vt 0.249022 0.929334
vt 0.213328 0.929334
vt 0.213328 0.888621
vt 0.406722 0.964074
vt 0.371027 0.964074
vt 0.371027 0.923362
vt 0.505245 0.903820
vt 0.469551 0.903820
vt 0.469551 0.863107
vt 0.191893 0.955207
vt 0.156199 0.955207
vt 0.156199 0.914494
vt 0.136683 0.974389
vt 0.100988 0.974389
vt 0.100988 0.933677
vt 0.351511 0.903820
vt 0.315817 0.903820
vt 0.315817 0.863107
vt 0.505245 0.964074
vt 0.469551 0.964074
vt 0.469551 0.923362
vt 0.009758 0.842556
vt 0.045453 0.842556
vt 0.045453 0.883269
vt 0.935031 0.110738
vt 0.899337 0.110738
vt 0.899337 0.070026
vt 0.899337 0.136733
vt 0.935031 0.136733
vt 0.935031 0.177445
vt 0.954548 0.563561
vt 0.966446 0.390045
vt 0.978344 0.390045
vt 0.213328 0.948876
vt 0.249022 0.948876
vt 0.249022 0.989588
vt 0.191893 0.894952
vt 0.156199 0.894952
vt 0.156199 0.854239
vt 0.023418 0.307846
vt 0.031869 0.313501
vt 0.019727 0.342853
vt 0.556490 0.416897
vt 0.524761 0.416897
vt 0.524761 0.009771
vt 0.627250 0.009771
vt 0.658979 0.009771
vt 0.658979 0.416897
vt 0.780984 0.009771
vt 0.812712 0.009771
vt 0.812712 0.416897
vt 0.710223 0.416897
vt 0.678495 0.416897
vt 0.678495 0.009771
vt 0.761468 0.416897
vt 0.729739 0.416897
vt 0.729739 0.009771
vt 0.454001 0.416897
vt 0.422272 0.416897
vt 0.422272 0.009771
vt 0.473517 0.436439
vt 0.505245 0.436439
vt 0.505245 0.843565
vt 0.351511 0.843565
vt 0.319783 0.843565
vt 0.319783 0.436439
vt 0.300267 0.843565
vt 0.268538 0.843565
vt 0.268538 0.436439
vt 0.217294 0.268895
vt 0.249022 0.268895
vt 0.249022 0.676021
vt 0.300267 0.416897
vt 0.268538 0.416897
vt 0.268538 0.009771
vt 0.402756 0.416897
vt 0.371028 0.416897
vt 0.371027 0.009771
vt 0.505245 0.416897
vt 0.473517 0.416897
vt 0.473517 0.009771
vt 0.351511 0.416897
vt 0.319783 0.416897
vt 0.319783 0.009771
vt 0.454000 0.436439
vt 0.454000 0.843565
vt 0.422272 0.843565
vt 0.576006 0.009771
vt 0.607734 0.009771
vt 0.607734 0.416897
vt 0.840160 0.009771
vt 0.871889 0.009771
vt 0.879821 0.177445
vt 0.136683 0.878230
vt 0.136683 0.890144
vt 0.089833 0.858799
vt 0.603768 0.984388
vt 0.615666 0.810872
vt 0.627564 0.810872
vt 0.658979 0.984388
vt 0.670877 0.810872
vt 0.682775 0.810872
vt 0.773680 0.984388
vt 0.737986 0.984388
vt 0.749884 0.810872
vt 0.112561 0.834697
vt 0.076867 0.834697
vt 0.088765 0.661181
vt 0.895999 0.990229
vt 0.860305 0.990229
vt 0.872203 0.816713
vt 0.951210 0.990229
vt 0.915515 0.990229
vt 0.927413 0.816713
vt 0.935031 0.563561
vt 0.899337 0.563561
vt 0.911235 0.390045
vt 0.915515 0.797171
vt 0.927414 0.623655
vt 0.939312 0.623655
vt 0.112561 0.641639
vt 0.076867 0.641639
vt 0.088765 0.468123
vt 0.213328 0.869079
vt 0.225226 0.695563
vt 0.237124 0.695563
vt 0.860305 0.797171
vt 0.872203 0.623655
vt 0.884101 0.623655
vt 0.954548 0.370503
vt 0.966446 0.196987
vt 0.978344 0.196987
vt 0.899337 0.370503
vt 0.911235 0.196987
vt 0.923133 0.196987
vt 0.524761 0.984388
vt 0.536659 0.810872
vt 0.548557 0.810872
vt 0.805094 0.984387
vt 0.816992 0.810872
vt 0.828891 0.810872
vt 0.061624 0.028008
vt 0.105594 0.009771
vt 0.027971 0.197418
vt 0.181274 0.468123
vt 0.189206 0.635798
vt 0.141614 0.635798
vt 0.049419 0.655340
vt 0.057351 0.823014
vt 0.009758 0.823014
vt 0.871889 0.249223
vt 0.879821 0.416897
vt 0.832228 0.416897
vt 0.765748 0.436439
vt 0.773680 0.604113
vt 0.726087 0.604113
vt 0.532693 0.791330
vt 0.524761 0.623655
vt 0.572354 0.623655
vt 0.698639 0.436439
vt 0.706571 0.604113
vt 0.658979 0.604113
vt 0.181274 0.655340
vt 0.189206 0.823014
vt 0.141614 0.823014
vt 0.631531 0.604113
vt 0.599802 0.604113
vt 0.591870 0.436439
vt 0.599802 0.791330
vt 0.591870 0.623655
vt 0.639463 0.623655
vt 0.698639 0.623655
vt 0.706571 0.791330
vt 0.658979 0.791330
vt 0.049419 0.468123
vt 0.057351 0.635798
vt 0.009758 0.635798
vt 0.801128 0.436439
vt 0.832857 0.436439
vt 0.840789 0.604113
vt 0.564422 0.436439
vt 0.572354 0.604113
vt 0.524761 0.604113
vt 0.801128 0.623655
vt 0.832857 0.623655
vt 0.840789 0.791330
vt 0.765748 0.791330
vt 0.734019 0.791330
vt 0.726087 0.623655
vt 0.009758 0.376609
vt 0.009758 0.340867
vt 0.031869 0.403976
vt 0.023418 0.409630
vt 0.054305 0.426441
vt 0.048657 0.434904
vt 0.081635 0.448581
vt 0.117329 0.448581
vt 0.083618 0.438599
vt 0.150307 0.434904
vt 0.115346 0.438599
vt 0.175547 0.409630
vt 0.144660 0.426441
vt 0.179237 0.374624
vt 0.189206 0.376609
vt 0.189206 0.340867
vt 0.167095 0.313501
vt 0.175547 0.307846
vt 0.144660 0.291036
vt 0.150307 0.282573
vt 0.115346 0.278878
vt 0.117329 0.268895
vt 0.081635 0.268895
vt 0.054305 0.291036
vt 0.048658 0.282573
vt 0.406722 0.863107
vt 0.351511 0.923362
vt 0.935031 0.009771
vt 0.045453 0.902811
vt 0.249022 0.888621
vt 0.406722 0.923362
vt 0.505245 0.863107
vt 0.191893 0.914494
vt 0.136683 0.933677
vt 0.351511 0.863107
vt 0.505245 0.923362
vt 0.009758 0.883269
vt 0.935031 0.070026
vt 0.899337 0.177445
vt 0.990242 0.563561
vt 0.213328 0.989588
vt 0.191893 0.854239
vt 0.556490 0.009771
vt 0.627250 0.416897
vt 0.780984 0.416897
vt 0.710223 0.009771
vt 0.761468 0.009771
vt 0.454000 0.009771
vt 0.473517 0.843565
vt 0.351511 0.436439
vt 0.300267 0.436439
vt 0.217294 0.676021
vt 0.300267 0.009771
vt 0.402756 0.009771
vt 0.505245 0.009771
vt 0.351511 0.009771
vt 0.422272 0.436439
vt 0.576006 0.416897
vt 0.832228 0.177445
vt 0.132130 0.901151
vt 0.123716 0.909575
vt 0.112724 0.914135
vt 0.100826 0.914135
vt 0.081420 0.901151
vt 0.076867 0.890144
vt 0.089833 0.909575
vt 0.076867 0.878230
vt 0.081420 0.867223
vt 0.100826 0.854239
vt 0.112724 0.854239
vt 0.123716 0.858799
vt 0.132130 0.867223
vt 0.639463 0.984388
vt 0.694673 0.984388
vt 0.761782 0.810872
vt 0.100663 0.661181
vt 0.884101 0.816713
vt 0.939312 0.816713
vt 0.923133 0.390045
vt 0.951210 0.797171
vt 0.100663 0.468123
vt 0.249022 0.869079
vt 0.895999 0.797171
vt 0.990242 0.370503
vt 0.935031 0.370503
vt 0.560456 0.984388
vt 0.840789 0.984388
vt 0.197156 0.028008
vt 0.230809 0.061706
vt 0.249022 0.105734
vt 0.249022 0.153390
vt 0.230809 0.197418
vt 0.197156 0.231116
vt 0.153186 0.249353
vt 0.153186 0.009771
vt 0.061624 0.231116
vt 0.009758 0.153390
vt 0.009758 0.105734
vt 0.027971 0.061706
vt 0.105594 0.249353
vt 0.149546 0.468123
vt 0.017690 0.655340
vt 0.840160 0.249223
vt 0.734020 0.436439
vt 0.564422 0.791330
vt 0.666911 0.436439
vt 0.149545 0.655340
vt 0.639463 0.436439
vt 0.631530 0.791330
vt 0.666911 0.623655
vt 0.017690 0.468123
vt 0.793196 0.604113
vt 0.532693 0.436439
vt 0.793196 0.791330
vt 0.773680 0.623655
vt 0.019727 0.374623
vt 0.167095 0.403976
vt 0.179237 0.342853
vt 0.083618 0.278878
vn 0.000000 0.000000 -1.000000
vn 0.382684 0.000000 -0.923879
vn 0.707107 0.000000 -0.707107
vn 0.923879 0.000000 -0.382684
vn 1.000000 0.000000 0.000000
vn 0.923880 0.000000 0.382684
vn 0.707107 0.000000 0.707107
vn 0.382684 0.000000 0.923879
vn 0.000000 0.000000 1.000000
vn -0.382683 0.000000 0.923880
vn -0.707107 0.000000 0.707107
vn -0.923880 0.000000 0.382683
vn -1.000000 0.000000 -0.000000
vn -0.923880 0.000000 -0.382683
vn 0.663644 0.345188 -0.663643
vn -0.382683 0.000000 -0.923880
vn -0.707106 0.000000 -0.707107
vn 0.000000 -1.000000 0.000000
vn 0.382683 0.000000 -0.923880
vn 0.923880 0.000000 -0.382683
vn 0.923880 0.000000 0.382683
vn -0.923879 0.000000 0.382683
vn -0.923879 0.000000 -0.382684
vn -0.707107 0.000000 -0.707107
vn 0.371674 0.238142 -0.897300
vn 0.000000 1.000000 0.000006
vn -0.867092 0.345187 -0.359162
vn 0.867092 0.345188 0.359161
vn 0.000000 0.345187 0.938534
vn -0.867092 0.345188 0.359162
vn 0.867092 0.345188 -0.359161
vn -0.663643 0.345188 -0.663644
vn 0.663644 0.345188 0.663643
vn -0.359162 0.345188 0.867092
vn 0.359162 0.345188 -0.867092
vn -0.938534 0.345188 0.000001
vn 0.938534 0.345188 0.000001
vn -0.359160 0.345187 -0.867093
vn 0.000000 0.345188 -0.938534
vn 0.359162 0.345188 0.867092
vn -0.663643 0.345188 0.663644
vn -0.971230 0.238142 0.000000
vn 0.971230 0.238142 -0.000000
vn -0.371673 0.238142 -0.897300
vn 0.000000 0.238142 -0.971230
vn 0.371674 0.238142 0.897300
vn -0.686763 0.238142 0.686764
vn 0.686763 0.238142 -0.686764
vn -0.897300 0.238142 -0.371674
vn 0.897300 0.238142 0.371674
vn 0.000000 0.238142 0.971230
vn -0.897300 0.238142 0.371674
vn 0.897300 0.238142 -0.371674
vn -0.686763 0.238142 -0.686764
vn 0.686763 0.238142 0.686763
vn -0.371674 0.238142 0.897300
vn 0.000000 -1.000000 0.000003
vn 0.000000 -1.000000 -0.000002
vn 0.000000 -1.000000 0.000009
vn 0.000000 -1.000000 0.000002
vn 0.923879 0.000000 0.382684
vn 0.707107 0.000000 0.707106
vn 0.000001 0.000000 1.000000
vn -0.382684 0.000000 0.923879
vn -0.923879 0.000000 0.382684
vn -0.707107 0.000000 -0.707106
vn 0.000000 -1.000000 -0.000009
vn 0.382683 0.000000 0.923880
vn 0.000000 1.000000 0.000058
vn 0.000000 1.000000 -0.000015
vn 0.000000 1.000000 0.000000
vn 0.000000 1.000000 -0.000001
vn 0.000000 1.000000 -0.000029
vn 0.000000 1.000000 -0.000004
vn 0.000000 1.000000 -0.000016
vn -0.867092 0.345188 -0.359161
vn 0.000000 1.000000 0.000002
vn 0.867092 0.345187 0.359162
vn 0.000001 0.345187 0.938534
vn -0.867093 0.345188 0.359159
vn 0.867091 0.345187 -0.359165
vn -0.663643 0.345187 -0.663644
vn 0.663643 0.345187 0.663644
vn -0.359161 0.345188 0.867092
vn 0.359162 0.345187 -0.867092
vn -0.938534 0.345188 0.000000
vn 0.938534 0.345188 0.000000
vn -0.359162 0.345188 -0.867092
vn 0.359161 0.345188 0.867092
vn -0.663644 0.345188 0.663644
vn -0.371674 0.238142 -0.897300
vn 0.686764 0.238142 -0.686764
vn 0.686764 0.238142 0.686763
vn -0.371673 0.238142 0.897300
vn 0.000000 -1.000000 0.000005
vn 0.000000 -1.000000 -0.000010
s off
f 2/1/1 4/2/1 3/3/1
f 4/4/2 6/5/2 5/6/2
f 6/7/3 8/8/3 7/9/3
f 8/10/4 10/11/4 9/12/4
f 10/13/5 12/14/5 11/15/5
f 12/16/6 14/17/6 13/18/6
f 14/19/7 16/20/7 15/21/7
f 16/22/8 18/23/8 17/24/8
f 18/25/9 20/26/9 19/27/9
f 20/28/10 22/29/10 21/30/10
f 22/31/11 24/32/11 23/33/11
f 24/34/12 26/35/12 25/36/12
f 26/37/13 28/38/13 27/39/13
f 28/40/14 30/41/14 29/42/14
f 6/43/15 67/44/15 68/45/15
f 32/46/16 2/47/16 1/48/16
f 30/49/17 32/50/17 31/51/17
f 5/52/18 38/53/18 36/54/18
f 34/55/1 36/56/1 35/57/1
f 36/58/19 38/59/19 37/60/19
f 38/61/3 40/62/3 39/63/3
f 40/64/20 42/65/20 41/66/20
f 42/67/5 44/68/5 43/69/5
f 44/70/21 46/71/21 45/72/21
f 46/73/7 48/74/7 47/75/7
f 48/76/8 50/77/8 49/78/8
f 50/79/9 52/80/9 51/81/9
f 52/82/10 54/83/10 53/84/10
f 54/85/11 56/86/11 55/87/11
f 56/88/22 58/89/22 57/90/22
f 58/91/13 60/92/13 59/93/13
f 60/94/23 62/95/23 61/96/23
f 63/97/16 64/98/16 34/99/16
f 62/100/24 64/101/24 63/102/24
f 35/103/25 37/104/25 83/105/25
f 68/106/26 67/107/26 73/108/26
f 28/109/27 78/110/27 79/111/27
f 12/112/28 70/113/28 71/114/28
f 20/115/29 18/116/29 73/117/29
f 26/118/30 24/119/30 76/120/30
f 10/121/31 8/122/31 68/123/31
f 32/124/32 30/125/32 79/126/32
f 16/127/33 14/128/33 71/129/33
f 20/130/34 74/131/34 75/132/34
f 6/133/35 4/134/35 66/135/35
f 26/136/36 77/137/36 78/138/36
f 10/139/37 69/140/37 70/141/37
f 32/142/38 80/143/38 65/144/38
f 2/145/39 65/146/39 66/147/39
f 16/148/40 72/149/40 73/150/40
f 22/151/41 75/152/41 76/153/41
f 96/154/18 81/155/18 92/156/18
f 59/157/42 94/158/42 93/159/42
f 43/160/43 86/161/43 85/162/43
f 33/163/44 81/164/44 96/165/44
f 35/166/45 82/167/45 81/168/45
f 49/169/46 89/170/46 88/171/46
f 55/172/47 92/173/47 91/174/47
f 39/175/48 84/176/48 83/177/48
f 59/178/49 61/179/49 95/180/49
f 45/181/50 87/182/50 86/183/50
f 51/184/51 90/185/51 89/186/51
f 57/187/52 93/188/52 92/189/52
f 39/190/53 41/191/53 85/192/53
f 63/193/54 96/194/54 95/195/54
f 45/196/55 47/197/55 88/198/55
f 51/199/56 53/200/56 91/201/56
f 1/202/57 3/203/57 36/54/57
f 64/204/18 31/205/18 1/202/18
f 62/206/18 29/207/18 31/205/18
f 27/208/18 29/207/18 62/206/18
f 25/209/18 27/208/18 60/210/18
f 23/211/58 25/209/58 58/212/58
f 21/213/18 23/211/18 56/214/18
f 52/215/59 19/216/59 21/213/59
f 17/217/60 19/216/60 52/215/60
f 48/218/18 15/219/18 17/217/18
f 46/220/18 13/221/18 15/219/18
f 44/222/18 11/223/18 13/221/18
f 9/224/18 11/223/18 44/222/18
f 40/225/18 7/226/18 9/224/18
f 38/53/18 5/52/18 7/226/18
f 1/227/1 2/1/1 3/3/1
f 3/228/19 4/4/19 5/6/19
f 5/229/3 6/7/3 7/9/3
f 7/230/4 8/10/4 9/12/4
f 9/231/5 10/13/5 11/15/5
f 11/232/61 12/16/61 13/18/61
f 13/233/62 14/19/62 15/21/62
f 15/234/8 16/22/8 17/24/8
f 17/235/63 18/25/63 19/27/63
f 19/236/64 20/28/64 21/30/64
f 21/237/11 22/31/11 23/33/11
f 23/238/65 24/34/65 25/36/65
f 25/239/13 26/37/13 27/39/13
f 27/240/14 28/40/14 29/42/14
f 8/241/15 6/43/15 68/45/15
f 31/242/16 32/46/16 1/48/16
f 29/243/66 30/49/66 31/51/66
f 3/203/67 5/52/67 36/54/67
f 33/244/1 34/55/1 35/57/1
f 35/245/19 36/58/19 37/60/19
f 37/246/3 38/61/3 39/63/3
f 39/247/20 40/64/20 41/66/20
f 41/248/5 42/67/5 43/69/5
f 43/249/21 44/70/21 45/72/21
f 45/250/7 46/73/7 47/75/7
f 47/251/68 48/76/68 49/78/68
f 49/252/9 50/79/9 51/81/9
f 51/253/10 52/82/10 53/84/10
f 53/254/11 54/85/11 55/87/11
f 55/255/65 56/88/65 57/90/65
f 57/256/13 58/91/13 59/93/13
f 59/257/23 60/94/23 61/96/23
f 33/258/16 63/97/16 34/99/16
f 61/259/24 62/100/24 63/102/24
f 82/260/25 35/103/25 83/105/25
f 67/107/69 66/261/69 65/262/69
f 65/262/70 80/263/70 79/264/70
f 77/265/71 76/266/71 78/267/71
f 75/268/72 79/264/72 76/266/72
f 75/268/73 74/269/73 73/108/73
f 73/108/71 72/270/71 71/271/71
f 71/271/74 70/272/74 69/273/74
f 76/266/71 79/264/71 78/267/71
f 67/107/75 65/262/75 79/264/75
f 71/271/71 69/273/71 68/106/71
f 71/271/71 68/106/71 73/108/71
f 30/274/76 28/109/76 79/111/76
f 67/107/77 79/264/77 75/268/77
f 14/275/78 12/112/78 71/114/78
f 67/107/71 75/268/71 73/108/71
f 74/276/79 20/115/79 73/117/79
f 77/277/80 26/118/80 76/120/80
f 69/278/81 10/121/81 68/123/81
f 80/279/82 32/124/82 79/126/82
f 72/280/83 16/127/83 71/129/83
f 22/281/84 20/130/84 75/132/84
f 67/282/85 6/133/85 66/135/85
f 28/283/86 26/136/86 78/138/86
f 12/284/87 10/139/87 70/141/87
f 2/285/88 32/142/88 65/144/88
f 4/286/39 2/145/39 66/147/39
f 18/287/89 16/148/89 73/150/89
f 24/288/90 22/151/90 76/153/90
f 92/156/18 81/155/18 83/289/18
f 83/289/18 84/290/18 85/291/18
f 86/292/18 87/293/18 85/291/18
f 88/294/18 89/295/18 87/293/18
f 81/155/18 82/296/18 83/289/18
f 92/156/18 89/295/18 91/297/18
f 92/156/18 93/298/18 94/299/18
f 94/299/18 95/300/18 96/154/18
f 85/291/18 89/295/18 92/156/18
f 87/293/18 89/295/18 85/291/18
f 85/291/18 92/156/18 83/289/18
f 92/156/18 94/299/18 96/154/18
f 89/295/18 90/301/18 91/297/18
f 57/302/42 59/157/42 93/159/42
f 41/303/43 43/160/43 85/162/43
f 63/304/91 33/163/91 96/165/91
f 33/305/45 35/166/45 81/168/45
f 47/306/46 49/169/46 88/171/46
f 53/307/47 55/172/47 91/174/47
f 37/308/92 39/175/92 83/177/92
f 94/309/49 59/178/49 95/180/49
f 43/310/50 45/181/50 86/183/50
f 49/311/51 51/184/51 89/186/51
f 55/312/52 57/187/52 92/189/52
f 84/313/53 39/190/53 85/192/53
f 61/314/54 63/193/54 95/195/54
f 87/315/93 45/196/93 88/198/93
f 90/316/94 51/199/94 91/201/94
f 34/317/18 1/202/18 36/54/18
f 34/317/18 64/204/18 1/202/18
f 64/204/18 62/206/18 31/205/18
f 60/210/18 27/208/18 62/206/18
f 58/212/18 25/209/18 60/210/18
f 56/214/60 23/211/60 58/212/60
f 54/318/95 21/213/95 56/214/95
f 54/318/18 52/215/18 21/213/18
f 50/319/18 17/217/18 52/215/18
f 50/319/96 48/218/96 17/217/96
f 48/218/18 46/220/18 15/219/18
f 46/220/18 44/222/18 13/221/18
f 42/320/18 9/224/18 44/222/18
f 42/320/18 40/225/18 9/224/18
f 40/225/18 38/53/18 7/226/18

View File

@ -1,945 +0,0 @@
# Blender v2.76 (sub 0) OBJ File: 'NukeCloudHuge.blend'
# www.blender.org
o Cylinder
v -0.000000 0.000000 -6.000000
v -0.000000 1.000000 -3.125000
v 2.296101 0.000000 -5.543277
v 1.195886 1.000000 -2.887124
v 4.242640 0.000000 -4.242640
v 2.209708 1.000000 -2.209709
v 5.543277 0.000000 -2.296101
v 2.887123 1.000000 -1.195886
v 6.000000 0.000000 0.000000
v 3.125000 1.000000 0.000000
v 5.543277 0.000000 2.296101
v 2.887123 1.000000 1.195886
v 4.242640 0.000000 4.242640
v 2.209708 1.000000 2.209709
v 2.296101 0.000000 5.543277
v 1.195886 1.000000 2.887124
v 0.000001 0.000000 6.000000
v 0.000000 1.000000 3.125000
v -2.296099 0.000000 5.543278
v -1.195885 1.000000 2.887124
v -4.242640 0.000000 4.242642
v -2.209708 1.000000 2.209710
v -5.543277 0.000000 2.296102
v -2.887124 1.000000 1.195886
v -6.000000 0.000000 -0.000000
v -3.125000 1.000000 -0.000000
v -5.543277 0.000000 -2.296102
v -2.887124 1.000000 -1.195886
v -4.242640 0.000000 -4.242642
v -2.209708 1.000000 -2.209710
v -2.296098 0.000000 -5.543279
v -1.195884 1.000000 -2.887124
v -0.000000 2.000000 -1.500000
v 0.574025 2.000000 -1.385819
v 1.060660 2.000000 -1.060660
v 1.385819 2.000000 -0.574025
v 1.500000 2.000000 0.000000
v 1.385819 2.000000 0.574025
v 1.060660 2.000000 1.060660
v 0.574025 2.000000 1.385819
v 0.000000 2.000000 1.500000
v -0.574025 2.000000 1.385819
v -1.060660 2.000000 1.060660
v -1.385819 2.000000 0.574025
v -1.500000 2.000000 -0.000000
v -1.385819 2.000000 -0.574025
v -1.060660 2.000000 -1.060660
v -0.574024 2.000000 -1.385820
v -0.000000 8.000000 -0.750000
v 0.287013 8.000000 -0.692910
v 0.530330 8.000000 -0.530330
v 0.692910 8.000000 -0.287013
v 0.750000 8.000000 0.000000
v 0.692910 8.000000 0.287013
v 0.530330 8.000000 0.530330
v 0.287013 8.000000 0.692910
v 0.000000 8.000000 0.750000
v -0.287012 8.000000 0.692910
v -0.530330 8.000000 0.530330
v -0.692910 8.000000 0.287013
v -0.750000 8.000000 -0.000000
v -0.692910 8.000000 -0.287013
v -0.530330 8.000000 -0.530330
v -0.287012 8.000000 -0.692910
v -0.000000 6.000000 -3.000000
v 1.148050 6.000000 -2.771638
v 2.121320 6.000000 -2.121320
v 2.771638 6.000000 -1.148050
v 3.000000 6.000000 0.000000
v 2.771638 6.000000 1.148051
v 2.121320 6.000000 2.121320
v 1.148050 6.000000 2.771638
v 0.000000 6.000000 3.000000
v -1.148050 6.000000 2.771639
v -2.121320 6.000000 2.121321
v -2.771639 6.000000 1.148051
v -3.000000 6.000000 -0.000000
v -2.771639 6.000000 -1.148051
v -2.121320 6.000000 -2.121321
v -1.148049 6.000000 -2.771639
v -0.000001 6.000000 -5.000000
v 1.913417 6.000000 -4.619398
v 3.535533 6.000000 -3.535534
v 4.619397 6.000000 -1.913417
v 5.000000 6.000000 0.000000
v 4.619397 6.000000 1.913418
v 3.535533 6.000000 3.535534
v 1.913417 6.000000 4.619398
v 0.000000 6.000000 5.000000
v -1.913417 6.000000 4.619398
v -3.535533 6.000000 3.535535
v -4.619398 6.000000 1.913418
v -5.000000 6.000000 -0.000000
v -4.619398 6.000000 -1.913418
v -3.535533 6.000000 -3.535535
v -1.913416 6.000000 -4.619399
v -0.000001 7.000000 -6.500000
v 2.487442 7.000000 -6.005217
v 4.596193 7.000000 -4.596194
v 6.005217 7.000000 -2.487442
v 6.499999 7.000000 0.000000
v 6.005217 7.000000 2.487443
v 4.596193 7.000000 4.596194
v 2.487442 7.000000 6.005217
v 0.000000 7.000000 6.500000
v -2.487442 7.000000 6.005218
v -4.596194 7.000000 4.596196
v -6.005218 7.000000 2.487443
v -6.500001 7.000000 -0.000000
v -6.005217 7.000000 -2.487443
v -4.596193 7.000000 -4.596196
v -2.487440 7.000000 -6.005219
v -0.000001 8.000000 -7.150000
v 2.736187 8.000000 -6.605739
v 5.055813 8.000000 -5.055813
v 6.605738 8.000000 -2.736187
v 7.149999 8.000000 0.000000
v 6.605738 8.000000 2.736187
v 5.055813 8.000000 5.055813
v 2.736187 8.000000 6.605739
v 0.000001 8.000000 7.150000
v -2.736186 8.000000 6.605740
v -5.055813 8.000000 5.055815
v -6.605740 8.000000 2.736188
v -7.150000 8.000000 -0.000000
v -6.605739 8.000000 -2.736188
v -5.055813 8.000000 -5.055815
v -2.736184 8.000000 -6.605741
v -0.000001 9.500000 -6.250000
v 2.391771 9.500000 -5.774247
v 4.419416 9.500000 -4.419417
v 5.774246 9.500000 -2.391771
v 6.250000 9.500000 0.000000
v 5.774246 9.500000 2.391772
v 4.419416 9.500000 4.419417
v 2.391771 9.500000 5.774247
v 0.000000 9.500000 6.250000
v -2.391771 9.500000 5.774248
v -4.419417 9.500000 4.419419
v -5.774248 9.500000 2.391772
v -6.250000 9.500000 -0.000000
v -5.774247 9.500000 -2.391773
v -4.419416 9.500000 -4.419419
v -2.391769 9.500000 -5.774248
v -0.000000 10.500000 -3.500000
v 1.339392 10.500000 -3.233578
v 2.474873 10.500000 -2.474874
v 3.233578 10.500000 -1.339392
v 3.500000 10.500000 0.000000
v 3.233578 10.500000 1.339392
v 2.474873 10.500000 2.474874
v 1.339392 10.500000 3.233578
v 0.000000 10.500000 3.500000
v -1.339391 10.500000 3.233579
v -2.474874 10.500000 2.474874
v -3.233579 10.500000 1.339393
v -3.500000 10.500000 -0.000000
v -3.233578 10.500000 -1.339393
v -2.474873 10.500000 -2.474874
v -1.339391 10.500000 -3.233579
v -0.000000 11.000000 -1.000000
v 0.382683 11.000000 -0.923880
v 0.707106 11.000000 -0.707107
v 0.923879 11.000000 -0.382683
v 1.000000 11.000000 0.000000
v 0.923879 11.000000 0.382684
v 0.707106 11.000000 0.707107
v 0.382683 11.000000 0.923880
v -0.000000 11.000000 1.000000
v -0.382684 11.000000 0.923880
v -0.707107 11.000000 0.707107
v -0.923880 11.000000 0.382684
v -1.000000 11.000000 -0.000000
v -0.923880 11.000000 -0.382684
v -0.707107 11.000000 -0.707107
v -0.382683 11.000000 -0.923880
v 0.000000 11.250500 0.000000
vt 0.749890 0.583032
vt 0.708368 0.565532
vt 0.733595 0.459782
vt 0.663424 0.565532
vt 0.647304 0.459782
vt 0.621902 0.583032
vt 0.567581 0.493381
vt 0.590122 0.615366
vt 0.572923 0.657614
vt 0.473541 0.636579
vt 0.572923 0.703342
vt 0.473541 0.724377
vt 0.590122 0.745589
vt 0.506564 0.805492
vt 0.621902 0.777924
vt 0.567581 0.867574
vt 0.663424 0.795423
vt 0.647304 0.901173
vt 0.708368 0.795423
vt 0.749890 0.777924
vt 0.813318 0.867575
vt 0.781670 0.745589
vt 0.874336 0.805492
vt 0.798869 0.703342
vt 0.907358 0.724377
vt 0.798869 0.657614
vt 0.907358 0.636579
vt 0.650625 0.633704
vt 0.635370 0.649224
vt 0.781670 0.615366
vt 0.813318 0.493381
vt 0.922728 0.518034
vt 0.938204 0.737805
vt 0.930519 0.740416
vt 0.735569 0.669503
vt 0.627115 0.691453
vt 0.635370 0.711731
vt 0.670556 0.735652
vt 0.692128 0.735652
vt 0.692128 0.625304
vt 0.670556 0.625304
vt 0.727314 0.711731
vt 0.735569 0.691453
vt 0.627115 0.669503
vt 0.727314 0.649224
vt 0.712059 0.633704
vt 0.712059 0.727252
vt 0.976322 0.459782
vt 0.964547 0.515208
vt 0.942811 0.515208
vt 0.650625 0.727252
vt 0.242205 0.266674
vt 0.252246 0.262474
vt 0.298672 0.332635
vt 0.959113 0.736392
vt 0.948245 0.736392
vt 1.000000 0.523255
vt 0.976840 0.740416
vt 0.969154 0.737805
vt 0.927209 0.741881
vt 0.947256 0.962205
vt 0.937330 0.964292
vt 0.392623 0.776124
vt 0.401827 0.997180
vt 0.390982 0.997913
vt 0.948897 0.740416
vt 0.969121 0.741881
vt 0.968212 0.962205
vt 0.945516 0.000000
vt 0.950950 0.221184
vt 0.940909 0.222597
vt 0.967253 0.000000
vt 0.987335 0.002826
vt 0.971860 0.222597
vt 0.984630 0.518034
vt 0.428529 0.781763
vt 0.419779 1.000000
vt 0.411939 0.997913
vt 0.370935 0.777589
vt 0.381057 1.000000
vt 0.958100 0.961473
vt 0.412848 0.777589
vt 0.984803 0.746055
vt 0.976053 0.964292
vt 0.961819 0.221184
vt 0.258508 0.349435
vt 0.272999 0.423000
vt 0.200543 0.423000
vt 0.264090 0.244574
vt 0.346049 0.261036
vt 0.329413 0.301594
vt 0.264090 0.233599
vt 0.259931 0.223460
vt 0.329413 0.176580
vt 0.213610 0.223460
vt 0.144129 0.176580
vt 0.174869 0.145538
vt 0.242205 0.211500
vt 0.258508 0.128739
vt 0.298672 0.145538
vt 0.209451 0.244574
vt 0.127492 0.261036
vt 0.127492 0.217137
vt 0.221295 0.215700
vt 0.215034 0.128739
vt 0.221295 0.262474
vt 0.174869 0.332635
vt 0.144129 0.301594
vt 0.215034 0.349435
vt 0.259931 0.254714
vt 0.346049 0.217137
vt 0.252246 0.215700
vt 0.209451 0.233599
vt 0.231336 0.211500
vt 0.213610 0.254714
vt 0.231336 0.266674
vt 0.133602 0.395001
vt 0.189674 0.478174
vt 0.391174 0.343265
vt 0.418902 0.202504
vt 0.339940 0.083173
vt 0.391174 0.134908
vt 0.054639 0.202504
vt 0.200542 0.055174
vt 0.272999 0.055174
vt 0.082367 0.343265
vt 0.054639 0.275669
vt 0.339940 0.395001
vt 0.418902 0.275669
vt 0.082367 0.134908
vt 0.133602 0.083173
vt 0.012127 0.565699
vt 0.040349 0.552155
vt 0.027010 0.648817
vt 0.370890 0.441775
vt 0.283867 0.478174
vt 0.473541 0.286644
vt 0.437495 0.103655
vt 0.473541 0.191529
vt 0.036046 0.103655
vt 0.102651 0.036399
vt 0.283867 0.000000
vt 0.370890 0.036399
vt 0.000000 0.286644
vt 0.000000 0.191529
vt 0.189674 0.000000
vt 0.102651 0.441775
vt 0.036046 0.374519
vt 0.437495 0.374519
vt 0.090501 0.655402
vt 0.090501 0.746859
vt 0.089239 0.462044
vt 0.015974 0.388062
vt 0.237396 0.657564
vt 0.264031 0.650998
vt 0.270949 0.755390
vt 0.457568 0.388062
vt 0.384302 0.462044
vt 0.351085 0.674706
vt 0.351085 0.579591
vt 0.378094 0.574836
vt 0.384302 0.016130
vt 0.457567 0.090112
vt 0.129996 0.752467
vt 0.157260 0.755391
vt 0.176961 0.850938
vt 0.000000 0.748688
vt 0.000000 0.653573
vt 0.123707 0.657564
vt 0.129996 0.569068
vt 0.157260 0.553652
vt 0.243685 0.752466
vt 0.290650 0.850937
vt 0.243685 0.569068
vt 0.270949 0.553652
vt 0.363211 0.762580
vt 0.378094 0.679462
vt 0.363211 0.491717
vt 0.391433 0.478174
vt 0.015974 0.090112
vt 0.089239 0.016130
vt 0.027010 0.753444
vt 0.040349 0.850105
vt 0.150342 0.650998
vt 0.571499 0.034999
vt 0.654544 0.000000
vt 0.669765 0.101152
vt 0.220175 0.568195
vt 0.214127 0.653287
vt 0.333863 0.744540
vt 0.351085 0.828060
vt 0.333863 0.568195
vt 0.327816 0.653287
vt 0.391433 0.776124
vt 0.441586 0.672877
vt 0.453246 0.496926
vt 0.441586 0.581420
vt 0.064997 0.478174
vt 0.123707 0.506238
vt 0.102162 0.570908
vt 0.102162 0.831353
vt 0.220174 0.744540
vt 0.176961 0.478174
vt 0.237396 0.502217
vt 0.290650 0.478174
vt 0.351084 0.502217
vt 0.123707 0.896023
vt 0.925434 0.275619
vt 0.821464 0.255499
vt 0.821464 0.204283
vt 0.827476 0.034999
vt 0.766607 0.120751
vt 0.720102 0.101152
vt 0.827476 0.424784
vt 0.766607 0.339031
vt 0.802200 0.302816
vt 0.654544 0.459782
vt 0.669765 0.358630
vt 0.720102 0.358630
vt 0.507939 0.360114
vt 0.587667 0.302816
vt 0.623260 0.339031
vt 0.473541 0.184163
vt 0.568404 0.204283
vt 0.568404 0.255499
vt 0.623260 0.120751
vt 0.587667 0.156966
vt 0.891035 0.099668
vt 0.925434 0.184163
vt 0.744431 0.000000
vt 0.891035 0.360114
vt 0.744431 0.459782
vt 0.571499 0.424783
vt 0.473541 0.275619
vt 0.507939 0.099668
vt 0.802200 0.156966
vt 0.685466 0.266674
vt 0.699848 0.266674
vt 0.713135 0.261074
vt 0.656505 0.237208
vt 0.691516 0.229891
vt 0.662009 0.250727
vt 0.672179 0.261074
vt 0.723304 0.250727
vt 0.728808 0.237208
vt 0.728808 0.222575
vt 0.723304 0.209055
vt 0.662009 0.209055
vt 0.656505 0.222575
vt 0.713135 0.198708
vt 0.699848 0.193109
vt 0.685466 0.193109
vt 0.672179 0.198708
vt 0.506564 0.555464
vt 0.733595 0.901173
vt 0.874336 0.555464
vt 0.907358 0.523255
vt 0.931036 0.459782
vt 0.907358 0.746055
vt 0.925434 0.002826
vt 0.351085 0.781763
vt 0.147906 0.839327
vt 0.261595 0.839327
vt 0.012127 0.836562
vt 0.453246 0.757371
vt 0.064997 0.924087
vt 0.237396 0.828060
vn 0.065200 0.942500 -0.327800
vn 0.185700 0.942500 -0.277900
vn 0.277900 0.942500 -0.185700
vn 0.327800 0.942500 -0.065200
vn 0.327800 0.942500 0.065200
vn 0.277900 0.942500 0.185700
vn 0.185700 0.942500 0.277900
vn 0.065200 0.942500 0.327800
vn -0.065200 0.942500 0.327800
vn -0.185700 0.942500 0.277900
vn -0.277900 0.942500 0.185700
vn -0.327800 0.942500 0.065200
vn -0.327800 0.942500 -0.065200
vn -0.277900 0.942500 -0.185700
vn 0.521300 0.847100 -0.103700
vn -0.065200 0.942500 -0.327800
vn -0.185700 0.942500 -0.277900
vn 0.193600 0.121700 0.973500
vn -0.295300 0.847100 -0.441900
vn 0.295300 0.847100 0.441900
vn -0.295300 0.847100 0.441900
vn 0.295300 0.847100 -0.441900
vn -0.521300 0.847100 -0.103700
vn 0.521300 0.847100 0.103700
vn -0.103700 0.847100 -0.521300
vn 0.103700 0.847100 -0.521300
vn 0.103700 0.847100 0.521300
vn -0.441900 0.847100 0.295300
vn 0.441900 0.847100 -0.295300
vn -0.441900 0.847100 -0.295300
vn 0.441900 0.847100 0.295300
vn -0.103700 0.847100 0.521300
vn -0.521300 0.847100 0.103700
vn 0.131000 -0.741000 -0.658600
vn 0.825300 0.121700 0.551400
vn 0.973500 0.121700 -0.193600
vn -0.551400 0.121700 -0.825300
vn 0.551400 0.121700 -0.825300
vn -0.973500 0.121700 -0.193600
vn -0.825300 0.121700 0.551400
vn -0.193600 0.121700 0.973500
vn 0.551400 0.121700 0.825300
vn 0.973500 0.121700 0.193600
vn -0.193600 0.121700 -0.973500
vn 0.825300 0.121700 -0.551400
vn -0.825300 0.121700 -0.551400
vn 0.193600 0.121700 -0.973500
vn -0.973500 0.121700 0.193600
vn -0.551400 0.121700 0.825300
vn 0.000000 -1.000000 0.000000
vn -0.373100 -0.741000 -0.558400
vn -0.658600 -0.741000 -0.131000
vn 0.131000 -0.741000 0.658600
vn -0.558400 -0.741000 0.373100
vn 0.558400 -0.741000 0.373100
vn -0.131000 -0.741000 0.658600
vn 0.658600 -0.741000 -0.131000
vn 0.373100 -0.741000 -0.558400
vn -0.131000 -0.741000 -0.658600
vn -0.558400 -0.741000 -0.373100
vn -0.658600 -0.741000 0.131000
vn 0.373100 -0.741000 0.558400
vn -0.373100 -0.741000 0.558400
vn 0.658600 -0.741000 0.131000
vn 0.558400 -0.741000 -0.373100
vn -0.467400 -0.827000 0.312300
vn 0.164500 -0.537600 -0.827000
vn -0.109700 -0.827000 0.551400
vn 0.312300 -0.827000 0.467400
vn 0.551400 -0.827000 0.109700
vn -0.109700 -0.827000 -0.551400
vn 0.467400 -0.827000 -0.312300
vn -0.467400 -0.827000 -0.312300
vn 0.109700 -0.827000 -0.551400
vn -0.551400 -0.827000 0.109700
vn -0.312300 -0.827000 0.467400
vn 0.109700 -0.827000 0.551400
vn 0.467400 -0.827000 0.312300
vn 0.551400 -0.827000 -0.109700
vn -0.312300 -0.827000 -0.467400
vn 0.312300 -0.827000 -0.467400
vn -0.551400 -0.827000 -0.109700
vn 0.478800 0.507200 -0.716600
vn -0.827000 -0.537600 0.164500
vn -0.468500 -0.537600 0.701100
vn 0.164500 -0.537600 0.827000
vn 0.701100 -0.537600 0.468500
vn 0.827000 -0.537600 -0.164500
vn -0.468500 -0.537600 -0.701100
vn 0.468500 -0.537600 -0.701100
vn -0.827000 -0.537600 -0.164500
vn -0.701100 -0.537600 0.468500
vn -0.164500 -0.537600 0.827000
vn 0.468500 -0.537600 0.701100
vn 0.827000 -0.537600 0.164500
vn -0.164500 -0.537600 -0.827000
vn 0.701100 -0.537600 -0.468500
vn -0.701100 -0.537600 -0.468500
vn 0.289000 0.937600 -0.193100
vn -0.845300 0.507200 -0.168100
vn -0.716600 0.507200 0.478800
vn -0.168100 0.507200 0.845300
vn 0.478800 0.507200 0.716600
vn 0.845300 0.507200 0.168100
vn -0.168100 0.507200 -0.845300
vn 0.716600 0.507200 -0.478800
vn -0.716600 0.507200 -0.478800
vn 0.168100 0.507200 -0.845300
vn -0.845300 0.507200 0.168100
vn -0.478800 0.507200 0.716600
vn 0.168100 0.507200 0.845300
vn 0.716600 0.507200 0.478800
vn 0.845300 0.507200 -0.168100
vn -0.478800 0.507200 -0.716600
vn -0.289000 0.937600 -0.193100
vn 0.067800 0.937600 -0.341000
vn -0.341000 0.937600 0.067800
vn -0.193100 0.937600 0.289000
vn 0.067800 0.937600 0.341000
vn 0.289000 0.937600 0.193100
vn 0.341000 0.937600 -0.067800
vn -0.193100 0.937600 -0.289000
vn 0.193100 0.937600 -0.289000
vn -0.341000 0.937600 -0.067800
vn -0.289000 0.937600 0.193100
vn -0.067800 0.937600 0.341000
vn 0.193100 0.937600 0.289000
vn 0.341000 0.937600 0.067800
vn -0.067800 0.937600 -0.341000
vn -0.111000 0.979800 0.166100
vn -0.166100 0.979800 0.111000
vn 0.137500 0.968900 0.205800
vn 0.048300 0.968900 0.242700
vn -0.048300 0.968900 0.242700
vn -0.137500 0.968900 0.205800
vn -0.205800 0.968900 0.137500
vn -0.242700 0.968900 0.048300
vn -0.242700 0.968900 -0.048300
vn -0.205800 0.968900 -0.137500
vn -0.137500 0.968900 -0.205800
vn 0.242700 0.968900 0.048300
vn -0.048300 0.968900 -0.242700
vn 0.048300 0.968900 -0.242700
vn 0.137500 0.968900 -0.205800
vn 0.205800 0.968900 -0.137500
vn 0.242700 0.968900 -0.048300
vn 0.205800 0.968900 0.137500
vn -0.039000 0.979800 0.196000
vn 0.039000 0.979800 0.196000
vn 0.111000 0.979800 0.166100
vn 0.166100 0.979800 0.111000
vn 0.196000 0.979800 0.039000
vn 0.196000 0.979800 -0.039000
vn 0.166100 0.979800 -0.111000
vn 0.111000 0.979800 -0.166100
vn 0.039000 0.979800 -0.196000
vn -0.039000 0.979800 -0.196000
vn -0.111000 0.979800 -0.166100
vn -0.166100 0.979800 -0.111000
vn -0.196000 0.979800 -0.039000
vn -0.196000 0.979800 0.039000
s off
f 2/1/1 4/2/1 3/3/1
f 4/2/2 6/4/2 5/5/2
f 6/4/3 8/6/3 7/7/3
f 7/7/4 8/6/4 10/8/4
f 10/8/5 12/9/5 11/10/5
f 12/9/6 14/11/6 13/12/6
f 14/11/7 16/13/7 15/14/7
f 15/14/8 16/13/8 18/15/8
f 17/16/9 18/15/9 20/17/9
f 19/18/10 20/17/10 22/19/10
f 22/19/11 24/20/11 23/21/11
f 24/20/12 26/22/12 25/23/12
f 26/22/13 28/24/13 27/25/13
f 28/24/14 30/26/14 29/27/14
f 8/6/15 36/28/15 37/29/15
f 32/30/16 2/1/16 1/31/16
f 29/27/17 30/26/17 32/30/17
f 40/32/18 56/33/18 57/34/18
f 32/30/19 30/26/19 47/35/19
f 14/11/20 39/36/20 40/37/20
f 20/17/21 42/38/21 43/39/21
f 4/2/22 34/40/22 35/41/22
f 26/22/23 45/42/23 46/43/23
f 10/8/24 37/29/24 38/44/24
f 2/1/25 32/30/25 48/45/25
f 4/2/26 2/1/26 33/46/26
f 18/15/27 16/13/27 40/37/27
f 22/19/28 43/39/28 44/47/28
f 6/4/29 35/41/29 36/28/29
f 28/24/30 46/43/30 47/35/30
f 12/48/31 38/49/31 39/50/31
f 18/15/32 41/51/32 42/38/32
f 24/20/33 44/47/33 45/42/33
f 58/52/34 57/53/34 73/54/34
f 38/49/35 54/55/35 55/56/35
f 36/57/36 52/58/36 53/59/36
f 47/60/37 63/61/37 64/62/37
f 34/63/38 50/64/38 51/65/38
f 46/66/39 45/67/39 61/68/39
f 43/69/40 59/70/40 60/71/40
f 42/72/41 41/73/41 57/74/41
f 39/50/42 55/56/42 56/33/42
f 38/49/43 37/75/43 53/59/43
f 48/76/44 64/77/44 49/78/44
f 35/79/45 51/65/45 52/80/45
f 46/66/46 62/81/46 63/61/46
f 33/82/47 49/78/47 50/64/47
f 44/83/48 60/84/48 61/68/48
f 42/72/49 58/85/49 59/70/49
f 74/86/50 90/87/50 91/88/50
f 55/89/51 71/90/51 72/91/51
f 54/92/52 53/93/52 69/94/52
f 64/95/53 80/96/53 65/97/53
f 51/98/54 67/99/54 68/100/54
f 62/101/55 78/102/55 79/103/55
f 49/104/56 65/97/56 66/105/56
f 60/106/57 76/107/57 77/108/57
f 58/52/58 74/86/58 75/109/58
f 56/110/59 72/91/59 73/54/59
f 54/92/60 70/111/60 71/90/60
f 52/112/61 68/100/61 69/94/61
f 63/113/62 79/103/62 80/96/62
f 51/98/63 50/114/63 66/105/63
f 61/115/64 77/108/64 78/102/64
f 60/106/65 59/116/65 75/109/65
f 92/117/66 91/88/66 107/118/66
f 73/54/50 72/91/50 88/119/50
f 71/90/50 70/111/50 86/120/50
f 68/100/50 84/121/50 85/122/50
f 80/96/50 79/103/50 95/123/50
f 66/105/50 82/124/50 83/125/50
f 77/108/50 93/126/50 94/127/50
f 75/109/50 91/88/50 92/117/50
f 73/54/50 89/128/50 90/87/50
f 71/90/50 87/129/50 88/119/50
f 70/111/50 69/94/50 85/122/50
f 80/96/50 96/130/50 81/131/50
f 67/99/50 83/125/50 84/121/50
f 79/103/50 78/102/50 94/127/50
f 65/97/50 81/131/50 82/124/50
f 76/107/50 92/117/50 93/126/50
f 97/132/67 113/133/67 114/134/67
f 89/128/68 105/135/68 106/136/68
f 88/119/69 87/129/69 103/137/69
f 85/122/70 101/138/70 102/139/70
f 96/130/71 112/140/71 97/141/71
f 83/125/72 99/142/72 100/143/72
f 94/127/73 110/144/73 111/145/73
f 81/131/74 97/141/74 98/146/74
f 92/117/75 108/147/75 109/148/75
f 90/87/76 106/136/76 107/118/76
f 89/128/77 88/119/77 104/149/77
f 86/120/78 102/139/78 103/137/78
f 84/121/79 100/143/79 101/138/79
f 96/130/80 95/123/80 111/145/80
f 82/124/81 98/146/81 99/142/81
f 94/127/82 93/126/82 109/148/82
f 114/134/83 130/150/83 131/151/83
f 108/147/84 124/152/84 125/153/84
f 106/154/85 122/155/85 123/156/85
f 104/149/86 120/157/86 121/158/86
f 103/159/87 102/160/87 118/161/87
f 100/143/88 116/162/88 117/163/88
f 111/164/89 127/165/89 128/166/89
f 99/167/90 98/168/90 114/134/90
f 110/169/91 109/170/91 125/171/91
f 107/172/92 123/156/92 124/173/92
f 106/154/93 105/174/93 121/175/93
f 104/176/94 103/159/94 119/177/94
f 102/160/95 101/178/95 117/179/95
f 112/140/96 128/180/96 113/181/96
f 99/167/97 115/182/97 116/183/97
f 110/169/98 126/184/98 127/165/98
f 132/185/99 131/186/99 147/187/99
f 125/171/100 141/188/100 142/189/100
f 123/156/101 139/190/101 140/191/101
f 121/175/102 137/192/102 138/193/102
f 120/194/103 119/177/103 135/195/103
f 117/179/104 133/196/104 134/197/104
f 128/198/105 144/199/105 129/200/105
f 115/182/106 131/151/106 132/201/106
f 126/184/107 142/189/107 143/202/107
f 113/133/108 129/200/108 130/150/108
f 124/203/109 140/204/109 141/188/109
f 122/155/110 138/193/110 139/190/110
f 120/205/111 136/206/111 137/192/111
f 119/177/112 118/161/112 134/197/112
f 116/183/113 132/201/113 133/207/113
f 128/166/114 127/165/114 143/202/114
f 142/208/115 158/209/115 159/210/115
f 129/211/116 145/212/116 146/213/116
f 140/214/117 156/215/117 157/216/117
f 138/217/118 154/218/118 155/219/118
f 136/220/119 152/221/119 153/222/119
f 134/223/120 150/224/120 151/225/120
f 132/185/121 148/226/121 149/227/121
f 144/228/122 143/229/122 159/210/122
f 131/186/123 130/230/123 146/213/123
f 142/208/124 141/231/124 157/216/124
f 139/232/125 155/219/125 156/215/125
f 137/233/126 153/222/126 154/218/126
f 135/234/127 151/225/127 152/221/127
f 133/235/128 149/227/128 150/224/128
f 144/228/129 160/236/129 145/212/129
f 170/237/130 171/238/130 155/219/130
f 171/238/131 172/239/131 156/215/131
f 167/240/132 177/241/132 168/242/132
f 168/242/133 177/241/133 169/243/133
f 169/243/134 177/241/134 170/237/134
f 170/237/135 177/241/135 171/238/135
f 171/238/136 177/241/136 172/239/136
f 172/239/137 177/241/137 173/244/137
f 173/244/138 177/241/138 174/245/138
f 174/245/139 177/241/139 175/246/139
f 175/246/140 177/241/140 176/247/140
f 165/248/141 177/241/141 166/249/141
f 176/247/142 177/241/142 161/250/142
f 161/250/143 177/241/143 162/251/143
f 162/251/144 177/241/144 163/252/144
f 163/252/145 177/241/145 164/253/145
f 164/253/146 177/241/146 165/248/146
f 167/240/147 166/249/147 177/241/147
f 169/243/148 170/237/148 154/218/148
f 168/242/149 169/243/149 153/222/149
f 151/225/150 167/240/150 168/242/150
f 166/249/151 167/240/151 151/225/151
f 165/248/152 166/249/152 150/224/152
f 148/226/153 164/253/153 165/248/153
f 147/187/154 163/252/154 164/253/154
f 162/251/155 163/252/155 147/187/155
f 161/250/156 162/251/156 146/213/156
f 176/247/157 161/250/157 145/212/157
f 175/246/158 176/247/158 160/236/158
f 158/209/159 174/245/159 175/246/159
f 157/216/160 173/244/160 174/245/160
f 172/239/161 173/244/161 157/216/161
f 1/31/1 2/1/1 3/3/1
f 3/3/2 4/2/2 5/5/2
f 5/5/3 6/4/3 7/7/3
f 9/254/4 7/7/4 10/8/4
f 9/254/5 10/8/5 11/10/5
f 11/10/6 12/9/6 13/12/6
f 13/12/7 14/11/7 15/14/7
f 17/16/8 15/14/8 18/15/8
f 19/18/9 17/16/9 20/17/9
f 21/255/10 19/18/10 22/19/10
f 21/255/11 22/19/11 23/21/11
f 23/21/12 24/20/12 25/23/12
f 25/23/13 26/22/13 27/25/13
f 27/25/14 28/24/14 29/27/14
f 10/8/15 8/6/15 37/29/15
f 31/256/16 32/30/16 1/31/16
f 31/256/17 29/27/17 32/30/17
f 41/257/18 40/32/18 57/34/18
f 48/45/19 32/30/19 47/35/19
f 16/13/20 14/11/20 40/37/20
f 22/19/21 20/17/21 43/39/21
f 6/4/22 4/2/22 35/41/22
f 28/24/23 26/22/23 46/43/23
f 12/9/24 10/8/24 38/44/24
f 33/46/25 2/1/25 48/45/25
f 34/40/26 4/2/26 33/46/26
f 41/51/27 18/15/27 40/37/27
f 24/20/28 22/19/28 44/47/28
f 8/6/29 6/4/29 36/28/29
f 30/26/30 28/24/30 47/35/30
f 14/258/31 12/48/31 39/50/31
f 20/17/32 18/15/32 42/38/32
f 26/22/33 24/20/33 45/42/33
f 74/86/34 58/52/34 73/54/34
f 39/50/35 38/49/35 55/56/35
f 37/75/36 36/57/36 53/59/36
f 48/259/37 47/60/37 64/62/37
f 35/79/38 34/63/38 51/65/38
f 62/81/39 46/66/39 61/68/39
f 44/260/40 43/69/40 60/71/40
f 58/85/41 42/72/41 57/74/41
f 40/32/42 39/50/42 56/33/42
f 54/55/43 38/49/43 53/59/43
f 33/82/44 48/76/44 49/78/44
f 36/261/45 35/79/45 52/80/45
f 47/60/46 46/66/46 63/61/46
f 34/63/47 33/82/47 50/64/47
f 45/67/48 44/83/48 61/68/48
f 43/69/49 42/72/49 59/70/49
f 75/109/50 74/86/50 91/88/50
f 56/110/51 55/89/51 72/91/51
f 70/111/52 54/92/52 69/94/52
f 49/104/53 64/95/53 65/97/53
f 52/112/54 51/98/54 68/100/54
f 63/113/55 62/101/55 79/103/55
f 50/114/56 49/104/56 66/105/56
f 61/115/57 60/106/57 77/108/57
f 59/116/58 58/52/58 75/109/58
f 57/53/59 56/110/59 73/54/59
f 55/89/60 54/92/60 71/90/60
f 53/93/61 52/112/61 69/94/61
f 64/95/62 63/113/62 80/96/62
f 67/99/63 51/98/63 66/105/63
f 62/101/64 61/115/64 78/102/64
f 76/107/65 60/106/65 75/109/65
f 108/147/66 92/117/66 107/118/66
f 89/128/50 73/54/50 88/119/50
f 87/129/50 71/90/50 86/120/50
f 69/94/50 68/100/50 85/122/50
f 96/130/50 80/96/50 95/123/50
f 67/99/50 66/105/50 83/125/50
f 78/102/50 77/108/50 94/127/50
f 76/107/50 75/109/50 92/117/50
f 74/86/50 73/54/50 90/87/50
f 72/91/50 71/90/50 88/119/50
f 86/120/50 70/111/50 85/122/50
f 65/97/50 80/96/50 81/131/50
f 68/100/50 67/99/50 84/121/50
f 95/123/50 79/103/50 94/127/50
f 66/105/50 65/97/50 82/124/50
f 77/108/50 76/107/50 93/126/50
f 98/168/67 97/132/67 114/134/67
f 90/87/68 89/128/68 106/136/68
f 104/149/69 88/119/69 103/137/69
f 86/120/70 85/122/70 102/139/70
f 81/131/71 96/130/71 97/141/71
f 84/121/72 83/125/72 100/143/72
f 95/123/73 94/127/73 111/145/73
f 82/124/74 81/131/74 98/146/74
f 93/126/75 92/117/75 109/148/75
f 91/88/76 90/87/76 107/118/76
f 105/135/77 89/128/77 104/149/77
f 87/129/78 86/120/78 103/137/78
f 85/122/79 84/121/79 101/138/79
f 112/140/80 96/130/80 111/145/80
f 83/125/81 82/124/81 99/142/81
f 110/144/82 94/127/82 109/148/82
f 115/182/83 114/134/83 131/151/83
f 109/148/84 108/147/84 125/153/84
f 107/172/85 106/154/85 123/156/85
f 105/135/86 104/149/86 121/158/86
f 119/177/87 103/159/87 118/161/87
f 101/138/88 100/143/88 117/163/88
f 112/262/89 111/164/89 128/166/89
f 115/182/90 99/167/90 114/134/90
f 126/184/91 110/169/91 125/171/91
f 108/263/92 107/172/92 124/173/92
f 122/155/93 106/154/93 121/175/93
f 120/194/94 104/176/94 119/177/94
f 118/161/95 102/160/95 117/179/95
f 97/141/96 112/140/96 113/181/96
f 100/264/97 99/167/97 116/183/97
f 111/164/98 110/169/98 127/165/98
f 148/226/99 132/185/99 147/187/99
f 126/184/100 125/171/100 142/189/100
f 124/173/101 123/156/101 140/191/101
f 122/155/102 121/175/102 138/193/102
f 136/265/103 120/194/103 135/195/103
f 118/161/104 117/179/104 134/197/104
f 113/133/105 128/198/105 129/200/105
f 116/183/106 115/182/106 132/201/106
f 127/165/107 126/184/107 143/202/107
f 114/134/108 113/133/108 130/150/108
f 125/171/109 124/203/109 141/188/109
f 123/156/110 122/155/110 139/190/110
f 121/175/111 120/205/111 137/192/111
f 135/195/112 119/177/112 134/197/112
f 117/266/113 116/183/113 133/207/113
f 144/267/114 128/166/114 143/202/114
f 143/229/115 142/208/115 159/210/115
f 130/230/116 129/211/116 146/213/116
f 141/231/117 140/214/117 157/216/117
f 139/232/118 138/217/118 155/219/118
f 137/233/119 136/220/119 153/222/119
f 135/234/120 134/223/120 151/225/120
f 133/235/121 132/185/121 149/227/121
f 160/236/122 144/228/122 159/210/122
f 147/187/123 131/186/123 146/213/123
f 158/209/124 142/208/124 157/216/124
f 140/214/125 139/232/125 156/215/125
f 138/217/126 137/233/126 154/218/126
f 136/220/127 135/234/127 152/221/127
f 134/223/128 133/235/128 150/224/128
f 129/211/129 144/228/129 145/212/129
f 154/218/130 170/237/130 155/219/130
f 155/219/131 171/238/131 156/215/131
f 153/222/148 169/243/148 154/218/148
f 152/221/149 168/242/149 153/222/149
f 152/221/150 151/225/150 168/242/150
f 150/224/151 166/249/151 151/225/151
f 149/227/152 165/248/152 150/224/152
f 149/227/153 148/226/153 165/248/153
f 148/226/154 147/187/154 164/253/154
f 146/213/155 162/251/155 147/187/155
f 145/212/156 161/250/156 146/213/156
f 160/236/157 176/247/157 145/212/157
f 159/210/158 175/246/158 160/236/158
f 159/210/159 158/209/159 175/246/159
f 158/209/160 157/216/160 174/245/160
f 156/215/161 172/239/161 157/216/161

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,806 +0,0 @@
# Blender v2.76 (sub 0) OBJ File: 'RingBig.blend'
# www.blender.org
o Circle_Circle.001
v 0.000000 0.000000 -1.000000
v -0.195090 0.000000 -0.980785
v -0.382683 0.000000 -0.923880
v -0.555570 0.000000 -0.831470
v -0.707107 0.000000 -0.707107
v -0.831470 0.000000 -0.555570
v -0.923880 0.000000 -0.382683
v -0.980785 0.000000 -0.195090
v -1.000000 0.000000 -0.000000
v -0.980785 0.000000 0.195090
v -0.923880 0.000000 0.382683
v -0.831470 0.000000 0.555570
v -0.707107 0.000000 0.707107
v -0.555570 0.000000 0.831470
v -0.382683 0.000000 0.923880
v -0.195090 0.000000 0.980785
v 0.000000 0.000000 1.000000
v 0.195091 0.000000 0.980785
v 0.382684 0.000000 0.923879
v 0.555571 0.000000 0.831469
v 0.707107 0.000000 0.707106
v 0.831470 0.000000 0.555570
v 0.923880 0.000000 0.382683
v 0.980785 0.000000 0.195089
v 1.000000 0.000000 -0.000001
v 0.980785 0.000000 -0.195091
v 0.923879 0.000000 -0.382684
v 0.831469 0.000000 -0.555571
v 0.707106 0.000000 -0.707108
v 0.555569 0.000000 -0.831470
v 0.382682 0.000000 -0.923880
v 0.195089 0.000000 -0.980786
v -0.000000 0.000000 -0.450000
v -0.087791 0.000000 -0.441353
v -0.172208 0.000000 -0.415746
v -0.250007 0.000000 -0.374161
v -0.318198 0.000000 -0.318198
v -0.374161 0.000000 -0.250007
v -0.415746 0.000000 -0.172208
v -0.441353 0.000000 -0.087791
v -0.450000 0.000000 -0.000000
v -0.441353 0.000000 0.087790
v -0.415746 0.000000 0.172207
v -0.374161 0.000000 0.250006
v -0.318198 0.000000 0.318198
v -0.250007 0.000000 0.374161
v -0.172208 0.000000 0.415746
v -0.087791 0.000000 0.441353
v 0.000000 0.000000 0.450000
v 0.087791 0.000000 0.441353
v 0.172208 0.000000 0.415746
v 0.250007 0.000000 0.374161
v 0.318198 0.000000 0.318198
v 0.374161 0.000000 0.250006
v 0.415746 0.000000 0.172207
v 0.441353 0.000000 0.087790
v 0.450000 0.000000 -0.000001
v 0.441353 0.000000 -0.087791
v 0.415746 0.000000 -0.172208
v 0.374161 0.000000 -0.250007
v 0.318198 0.000000 -0.318199
v 0.250006 0.000000 -0.374162
v 0.172207 0.000000 -0.415746
v 0.087790 0.000000 -0.441354
v 0.000000 0.200000 -1.000000
v -0.195090 0.200000 -0.980785
v -0.382683 0.200000 -0.923880
v -0.555570 0.200000 -0.831470
v -0.707107 0.200000 -0.707107
v -0.831470 0.200000 -0.555570
v -0.923880 0.200000 -0.382683
v -0.980785 0.200000 -0.195090
v -1.000000 0.200000 -0.000000
v -0.980785 0.200000 0.195090
v -0.923880 0.200000 0.382683
v -0.831470 0.200000 0.555570
v -0.707107 0.200000 0.707107
v -0.555570 0.200000 0.831470
v -0.382683 0.200000 0.923880
v -0.195090 0.200000 0.980785
v 0.000000 0.200000 1.000000
v 0.195091 0.200000 0.980785
v 0.382684 0.200000 0.923879
v 0.555571 0.200000 0.831469
v 0.707107 0.200000 0.707106
v 0.831470 0.200000 0.555570
v 0.923880 0.200000 0.382683
v 0.980785 0.200000 0.195089
v 1.000000 0.200000 -0.000001
v 0.980785 0.200000 -0.195091
v 0.923879 0.200000 -0.382684
v 0.831469 0.200000 -0.555571
v 0.707106 0.200000 -0.707108
v 0.555569 0.200000 -0.831470
v 0.382682 0.200000 -0.923880
v 0.195089 0.200000 -0.980786
v -0.000000 0.200000 -0.450000
v -0.087791 0.200000 -0.441353
v -0.172208 0.200000 -0.415746
v -0.250007 0.200000 -0.374161
v -0.318198 0.200000 -0.318198
v -0.374161 0.200000 -0.250007
v -0.415746 0.200000 -0.172208
v -0.441353 0.200000 -0.087791
v -0.450000 0.200000 -0.000000
v -0.441353 0.200000 0.087790
v -0.415746 0.200000 0.172207
v -0.374161 0.200000 0.250006
v -0.318198 0.200000 0.318198
v -0.250007 0.200000 0.374161
v -0.172208 0.200000 0.415746
v -0.087791 0.200000 0.441353
v 0.000000 0.200000 0.450000
v 0.087791 0.200000 0.441353
v 0.172208 0.200000 0.415746
v 0.250007 0.200000 0.374161
v 0.318198 0.200000 0.318198
v 0.374161 0.200000 0.250006
v 0.415746 0.200000 0.172207
v 0.441353 0.200000 0.087790
v 0.450000 0.200000 -0.000001
v 0.441353 0.200000 -0.087791
v 0.415746 0.200000 -0.172208
v 0.374161 0.200000 -0.250007
v 0.318198 0.200000 -0.318199
v 0.250006 0.200000 -0.374162
v 0.172207 0.200000 -0.415746
v 0.087790 0.200000 -0.441354
vt 0.199619 0.056442
vt 0.150889 0.080345
vt 0.129815 0.061495
vt 0.109447 0.110768
vt 0.076886 0.146541
vt 0.047590 0.135046
vt 0.054458 0.186291
vt 0.022670 0.179212
vt 0.043024 0.228488
vt 0.009966 0.226098
vt 0.043024 0.271512
vt 0.054458 0.313710
vt 0.022670 0.320789
vt 0.076886 0.353459
vt 0.047590 0.364954
vt 0.109447 0.389232
vt 0.083769 0.404702
vt 0.150889 0.419655
vt 0.129815 0.438505
vt 0.199620 0.443558
vt 0.183960 0.465064
vt 0.253766 0.460022
vt 0.244123 0.483358
vt 0.311248 0.468416
vt 0.307992 0.492684
vt 0.369855 0.468416
vt 0.427337 0.460022
vt 0.436980 0.483358
vt 0.481483 0.443558
vt 0.530213 0.419655
vt 0.551287 0.438505
vt 0.571655 0.389232
vt 0.597334 0.404702
vt 0.604216 0.353459
vt 0.633512 0.364954
vt 0.626644 0.313710
vt 0.658432 0.320788
vt 0.638078 0.271512
vt 0.671137 0.273902
vt 0.638078 0.228488
vt 0.671137 0.226098
vt 0.626644 0.186290
vt 0.658432 0.179212
vt 0.604216 0.146541
vt 0.571655 0.110768
vt 0.597334 0.095298
vt 0.530214 0.080345
vt 0.551287 0.061495
vt 0.481483 0.056442
vt 0.497142 0.034936
vt 0.427337 0.039978
vt 0.436979 0.016642
vt 0.369855 0.031584
vt 0.311247 0.031584
vt 0.307991 0.007316
vt 0.253766 0.039978
vt 0.244123 0.016642
vt 0.129815 0.561495
vt 0.150889 0.580345
vt 0.199619 0.556442
vt 0.083768 0.595298
vt 0.109447 0.610768
vt 0.047590 0.635046
vt 0.076886 0.646541
vt 0.022670 0.679212
vt 0.054458 0.686291
vt 0.009966 0.726098
vt 0.043024 0.728488
vt 0.009966 0.773903
vt 0.043024 0.771512
vt 0.022670 0.820789
vt 0.054458 0.813710
vt 0.047590 0.864954
vt 0.076886 0.853459
vt 0.083769 0.904702
vt 0.109447 0.889232
vt 0.129815 0.938505
vt 0.150889 0.919655
vt 0.183960 0.965064
vt 0.199620 0.943558
vt 0.244123 0.983358
vt 0.253766 0.960022
vt 0.307992 0.992684
vt 0.311248 0.968416
vt 0.373111 0.992684
vt 0.369855 0.968416
vt 0.436980 0.983358
vt 0.427337 0.960022
vt 0.497142 0.965064
vt 0.481483 0.943558
vt 0.551287 0.938505
vt 0.530213 0.919655
vt 0.597334 0.904702
vt 0.571655 0.889232
vt 0.633512 0.864954
vt 0.604216 0.853459
vt 0.658432 0.820788
vt 0.626644 0.813710
vt 0.671137 0.773902
vt 0.638078 0.771512
vt 0.671137 0.726098
vt 0.638078 0.728488
vt 0.658432 0.679212
vt 0.626644 0.686290
vt 0.633512 0.635046
vt 0.604216 0.646541
vt 0.597334 0.595298
vt 0.571655 0.610768
vt 0.551287 0.561495
vt 0.530214 0.580345
vt 0.497142 0.534936
vt 0.481483 0.556442
vt 0.436979 0.516642
vt 0.427337 0.539978
vt 0.373111 0.507316
vt 0.369855 0.531584
vt 0.307991 0.507316
vt 0.311247 0.531584
vt 0.244123 0.516642
vt 0.253766 0.539978
vt 0.183960 0.534936
vt 0.691068 0.257060
vt 0.724286 0.257060
vt 0.724286 0.304865
vt 0.830585 0.492173
vt 0.797367 0.492173
vt 0.797367 0.444369
vt 0.777436 0.179993
vt 0.744217 0.179993
vt 0.744217 0.132188
vt 0.724286 0.179993
vt 0.691068 0.179993
vt 0.691068 0.132188
vt 0.724286 0.429737
vt 0.691068 0.429737
vt 0.691068 0.381933
vt 0.883735 0.117556
vt 0.850517 0.117556
vt 0.850517 0.069752
vt 0.724286 0.617046
vt 0.691068 0.617046
vt 0.691068 0.569241
vt 0.830585 0.554610
vt 0.797367 0.554610
vt 0.797367 0.506805
vt 0.883735 0.055120
vt 0.850517 0.055120
vt 0.850517 0.007316
vt 0.830585 0.429737
vt 0.797367 0.429737
vt 0.797367 0.381933
vt 0.691068 0.506805
vt 0.724286 0.506805
vt 0.724286 0.554610
vt 0.830586 0.117557
vt 0.797367 0.117557
vt 0.797367 0.069752
vt 0.777436 0.429737
vt 0.744217 0.429737
vt 0.744217 0.381933
vt 0.777436 0.617046
vt 0.744217 0.617046
vt 0.744217 0.569241
vt 0.744217 0.506805
vt 0.777436 0.506805
vt 0.777436 0.554610
vt 0.830585 0.617046
vt 0.797367 0.617046
vt 0.797367 0.569241
vt 0.777436 0.117557
vt 0.744217 0.117557
vt 0.744217 0.069752
vt 0.724286 0.492174
vt 0.691068 0.492174
vt 0.691068 0.444369
vt 0.724286 0.055120
vt 0.691068 0.055120
vt 0.691068 0.007316
vt 0.724286 0.242429
vt 0.691068 0.242429
vt 0.691068 0.194624
vt 0.744217 0.257060
vt 0.777436 0.257060
vt 0.777436 0.304865
vt 0.830585 0.055120
vt 0.797367 0.055120
vt 0.797367 0.007316
vt 0.830585 0.179993
vt 0.797367 0.179993
vt 0.797367 0.132188
vt 0.830585 0.304865
vt 0.797367 0.304865
vt 0.797367 0.257060
vt 0.744217 0.007316
vt 0.777436 0.007316
vt 0.777436 0.055120
vt 0.777436 0.242429
vt 0.744217 0.242429
vt 0.744217 0.194624
vt 0.777436 0.367301
vt 0.744217 0.367301
vt 0.744217 0.319497
vt 0.724286 0.117557
vt 0.691068 0.117557
vt 0.691068 0.069752
vt 0.830585 0.242429
vt 0.797367 0.242429
vt 0.797367 0.194624
vt 0.744217 0.444369
vt 0.777436 0.444369
vt 0.777436 0.492174
vt 0.797367 0.319497
vt 0.830585 0.319497
vt 0.830585 0.367301
vt 0.724286 0.367301
vt 0.691068 0.367301
vt 0.691068 0.319497
vt 0.956816 0.348179
vt 0.956816 0.305155
vt 0.990034 0.305155
vt 0.990034 0.247499
vt 0.990034 0.290524
vt 0.956816 0.290524
vt 0.936885 0.651089
vt 0.936885 0.694113
vt 0.903666 0.694113
vt 0.990034 0.007316
vt 0.990034 0.050340
vt 0.956816 0.050340
vt 0.883735 0.362811
vt 0.883735 0.405835
vt 0.850517 0.405835
vt 0.903666 0.348179
vt 0.903666 0.305155
vt 0.936885 0.305155
vt 0.936885 0.478122
vt 0.936885 0.521146
vt 0.903666 0.521146
vt 0.956816 0.405835
vt 0.956816 0.362811
vt 0.990034 0.362811
vt 0.883735 0.535778
vt 0.883735 0.578802
vt 0.850517 0.578802
vt 0.850517 0.348179
vt 0.850517 0.305155
vt 0.883735 0.305155
vt 0.850517 0.290524
vt 0.850517 0.247499
vt 0.883735 0.247499
vt 0.903666 0.405835
vt 0.903666 0.362811
vt 0.936885 0.362811
vt 0.850517 0.463491
vt 0.850517 0.420467
vt 0.883735 0.420467
vt 0.883735 0.651089
vt 0.883735 0.694113
vt 0.850517 0.694113
vt 0.903666 0.232868
vt 0.903666 0.189844
vt 0.936885 0.189844
vt 0.903666 0.050340
vt 0.903666 0.007316
vt 0.936885 0.007316
vt 0.903666 0.175212
vt 0.903666 0.132188
vt 0.936885 0.132188
vt 0.850517 0.636458
vt 0.850517 0.593434
vt 0.883735 0.593434
vt 0.850517 0.521146
vt 0.850517 0.478122
vt 0.883735 0.478122
vt 0.691068 0.674702
vt 0.691068 0.631677
vt 0.724286 0.631677
vt 0.990034 0.064971
vt 0.990034 0.107996
vt 0.956816 0.107996
vt 0.883735 0.132188
vt 0.883735 0.175212
vt 0.850517 0.175212
vt 0.903666 0.290524
vt 0.903666 0.247499
vt 0.936885 0.247499
vt 0.903666 0.463491
vt 0.903666 0.420467
vt 0.936885 0.420467
vt 0.903666 0.112776
vt 0.903666 0.069752
vt 0.936885 0.069752
vt 0.850517 0.232868
vt 0.850517 0.189844
vt 0.883735 0.189844
vt 0.744217 0.674701
vt 0.744217 0.631677
vt 0.777436 0.631677
vt 0.903666 0.636458
vt 0.903666 0.593434
vt 0.936885 0.593434
vt 0.830585 0.631677
vt 0.830586 0.674701
vt 0.797367 0.674701
vt 0.903666 0.578802
vt 0.903666 0.535778
vt 0.936885 0.535778
vt 0.956816 0.232868
vt 0.956816 0.189844
vt 0.990034 0.189844
vt 0.990034 0.132188
vt 0.990034 0.175212
vt 0.956816 0.175212
vt 0.183960 0.034936
vt 0.083768 0.095298
vt 0.009966 0.273903
vt 0.373111 0.492684
vt 0.497142 0.465064
vt 0.633512 0.135046
vt 0.373111 0.007316
vt 0.691068 0.304865
vt 0.830585 0.444369
vt 0.777436 0.132188
vt 0.724286 0.132188
vt 0.724286 0.381933
vt 0.883735 0.069752
vt 0.724286 0.569241
vt 0.830585 0.506805
vt 0.883735 0.007316
vt 0.830585 0.381933
vt 0.691068 0.554610
vt 0.830586 0.069752
vt 0.777436 0.381933
vt 0.777436 0.569241
vt 0.744217 0.554610
vt 0.830585 0.569241
vt 0.777436 0.069752
vt 0.724286 0.444369
vt 0.724286 0.007316
vt 0.724286 0.194624
vt 0.744217 0.304865
vt 0.830585 0.007316
vt 0.830585 0.132188
vt 0.830585 0.257060
vt 0.744217 0.055120
vt 0.777436 0.194624
vt 0.777436 0.319497
vt 0.724286 0.069752
vt 0.830585 0.194624
vt 0.744217 0.492174
vt 0.797367 0.367301
vt 0.724286 0.319497
vt 0.990034 0.348179
vt 0.956816 0.247499
vt 0.903666 0.651089
vt 0.956816 0.007316
vt 0.850517 0.362811
vt 0.936885 0.348179
vt 0.903666 0.478122
vt 0.990034 0.405835
vt 0.850517 0.535778
vt 0.883735 0.348179
vt 0.883735 0.290524
vt 0.936885 0.405835
vt 0.883735 0.463491
vt 0.850517 0.651089
vt 0.936885 0.232868
vt 0.936885 0.050340
vt 0.936885 0.175212
vt 0.883735 0.636458
vt 0.883735 0.521146
vt 0.724286 0.674702
vt 0.956816 0.064971
vt 0.850517 0.132188
vt 0.936885 0.290524
vt 0.936885 0.463491
vt 0.936885 0.112776
vt 0.883735 0.232868
vt 0.777436 0.674701
vt 0.936885 0.636458
vt 0.797367 0.631677
vt 0.936885 0.578802
vt 0.990034 0.232868
vt 0.956816 0.132188
vn 0.000000 -1.000000 0.000000
vn -0.000000 1.000000 0.000000
vn 0.881900 0.000000 -0.471400
vn 0.773000 0.000000 -0.634400
vn 0.634400 0.000000 -0.773000
vn 0.471400 0.000000 -0.881900
vn 0.290300 0.000000 -0.956900
vn 0.098000 0.000000 -0.995200
vn -0.098000 0.000000 -0.995200
vn -0.290300 0.000000 -0.956900
vn -0.471400 0.000000 -0.881900
vn -0.634400 0.000000 -0.773000
vn -0.773000 0.000000 -0.634400
vn -0.881900 0.000000 -0.471400
vn -0.956900 0.000000 -0.290300
vn -0.995200 0.000000 -0.098000
vn -0.995200 0.000000 0.098000
vn -0.956900 0.000000 0.290300
vn -0.881900 0.000000 0.471400
vn -0.773000 0.000000 0.634400
vn -0.634400 0.000000 0.773000
vn -0.471400 0.000000 0.881900
vn -0.290300 0.000000 0.956900
vn -0.098000 0.000000 0.995200
vn 0.098000 0.000000 0.995200
vn 0.290300 0.000000 0.956900
vn 0.471400 0.000000 0.881900
vn 0.634400 0.000000 0.773000
vn 0.773000 0.000000 0.634400
vn 0.881900 0.000000 0.471400
vn 0.956900 0.000000 0.290300
vn 0.995200 0.000000 0.098000
vn 0.995200 0.000000 -0.098000
vn 0.956900 0.000000 -0.290300
s off
f 49/1/1 50/2/1 18/3/1
f 18/3/1 50/2/1 51/4/1
f 51/4/1 52/5/1 20/6/1
f 52/5/1 53/7/1 21/8/1
f 53/7/1 54/9/1 22/10/1
f 22/10/1 54/9/1 55/11/1
f 55/11/1 56/12/1 24/13/1
f 56/12/1 57/14/1 25/15/1
f 57/14/1 58/16/1 26/17/1
f 58/16/1 59/18/1 27/19/1
f 59/18/1 60/20/1 28/21/1
f 60/20/1 61/22/1 29/23/1
f 61/22/1 62/24/1 30/25/1
f 30/25/1 62/24/1 63/26/1
f 63/26/1 64/27/1 32/28/1
f 32/28/1 64/27/1 33/29/1
f 33/29/1 34/30/1 2/31/1
f 34/30/1 35/32/1 3/33/1
f 35/32/1 36/34/1 4/35/1
f 36/34/1 37/36/1 5/37/1
f 37/36/1 38/38/1 6/39/1
f 38/38/1 39/40/1 7/41/1
f 39/40/1 40/42/1 8/43/1
f 8/43/1 40/42/1 41/44/1
f 41/44/1 42/45/1 10/46/1
f 42/45/1 43/47/1 11/48/1
f 11/48/1 43/47/1 44/49/1
f 12/50/1 44/49/1 45/51/1
f 13/52/1 45/51/1 46/53/1
f 46/53/1 47/54/1 15/55/1
f 15/55/1 47/54/1 48/56/1
f 16/57/1 48/56/1 49/1/1
f 82/58/2 114/59/2 113/60/2
f 83/61/2 115/62/2 114/59/2
f 83/61/2 84/63/2 116/64/2
f 85/65/2 117/66/2 116/64/2
f 86/67/2 118/68/2 117/66/2
f 86/67/2 87/69/2 119/70/2
f 88/71/2 120/72/2 119/70/2
f 89/73/2 121/74/2 120/72/2
f 90/75/2 122/76/2 121/74/2
f 91/77/2 123/78/2 122/76/2
f 92/79/2 124/80/2 123/78/2
f 93/81/2 125/82/2 124/80/2
f 94/83/2 126/84/2 125/82/2
f 94/83/2 95/85/2 127/86/2
f 96/87/2 128/88/2 127/86/2
f 65/89/2 97/90/2 128/88/2
f 66/91/2 98/92/2 97/90/2
f 67/93/2 99/94/2 98/92/2
f 68/95/2 100/96/2 99/94/2
f 68/95/2 69/97/2 101/98/2
f 70/99/2 102/100/2 101/98/2
f 71/101/2 103/102/2 102/100/2
f 71/101/2 72/103/2 104/104/2
f 73/105/2 105/106/2 104/104/2
f 74/107/2 106/108/2 105/106/2
f 75/109/2 107/110/2 106/108/2
f 75/109/2 76/111/2 108/112/2
f 76/111/2 77/113/2 109/114/2
f 77/113/2 78/115/2 110/116/2
f 79/117/2 111/118/2 110/116/2
f 79/117/2 80/119/2 112/120/2
f 81/121/2 113/60/2 112/120/2
f 28/122/3 92/123/3 91/124/3
f 29/125/4 93/126/4 92/127/4
f 30/128/5 94/129/5 93/130/5
f 31/131/6 95/132/6 94/133/6
f 32/134/7 96/135/7 95/136/7
f 1/137/8 65/138/8 96/139/8
f 2/140/9 66/141/9 65/142/9
f 3/143/10 67/144/10 66/145/10
f 4/146/11 68/147/11 67/148/11
f 5/149/12 69/150/12 68/151/12
f 6/152/13 70/153/13 69/154/13
f 7/155/14 71/156/14 70/157/14
f 8/158/15 72/159/15 71/160/15
f 9/161/16 73/162/16 72/163/16
f 10/164/17 74/165/17 73/166/17
f 11/167/18 75/168/18 74/169/18
f 12/170/19 76/171/19 75/172/19
f 13/173/20 77/174/20 76/175/20
f 14/176/21 78/177/21 77/178/21
f 15/179/22 79/180/22 78/181/22
f 16/182/23 80/183/23 79/184/23
f 17/185/24 81/186/24 80/187/24
f 18/188/25 82/189/25 81/190/25
f 19/191/26 83/192/26 82/193/26
f 20/194/27 84/195/27 83/196/27
f 21/197/28 85/198/28 84/199/28
f 22/200/29 86/201/29 85/202/29
f 23/203/30 87/204/30 86/205/30
f 24/206/31 88/207/31 87/208/31
f 25/209/32 89/210/32 88/211/32
f 26/212/33 90/213/33 89/214/33
f 27/215/34 91/216/34 90/217/34
f 103/218/31 104/219/31 40/220/31
f 102/221/30 103/222/30 39/223/30
f 101/224/29 102/225/29 38/226/29
f 100/227/28 101/228/28 37/229/28
f 99/230/27 100/231/27 36/232/27
f 98/233/26 99/234/26 35/235/26
f 97/236/25 98/237/25 34/238/25
f 128/239/24 97/240/24 33/241/24
f 127/242/23 128/243/23 64/244/23
f 126/245/22 127/246/22 63/247/22
f 125/248/21 126/249/21 62/250/21
f 124/251/20 125/252/20 61/253/20
f 123/254/19 124/255/19 60/256/19
f 122/257/18 123/258/18 59/259/18
f 121/260/17 122/261/17 58/262/17
f 120/263/16 121/264/16 57/265/16
f 119/266/15 120/267/15 56/268/15
f 118/269/14 119/270/14 55/271/14
f 117/272/13 118/273/13 54/274/13
f 116/275/12 117/276/12 53/277/12
f 115/278/11 116/279/11 52/280/11
f 114/281/10 115/282/10 51/283/10
f 113/284/9 114/285/9 50/286/9
f 112/287/8 113/288/8 49/289/8
f 111/290/7 112/291/7 48/292/7
f 110/293/6 111/294/6 47/295/6
f 109/296/5 110/297/5 46/298/5
f 108/299/4 109/300/4 45/301/4
f 107/302/3 108/303/3 44/304/3
f 106/305/34 107/306/34 43/307/34
f 105/308/33 106/309/33 42/310/33
f 104/311/32 105/312/32 41/313/32
f 17/314/1 49/1/1 18/3/1
f 19/315/1 18/3/1 51/4/1
f 19/315/1 51/4/1 20/6/1
f 20/6/1 52/5/1 21/8/1
f 21/8/1 53/7/1 22/10/1
f 23/316/1 22/10/1 55/11/1
f 23/316/1 55/11/1 24/13/1
f 24/13/1 56/12/1 25/15/1
f 25/15/1 57/14/1 26/17/1
f 26/17/1 58/16/1 27/19/1
f 27/19/1 59/18/1 28/21/1
f 28/21/1 60/20/1 29/23/1
f 29/23/1 61/22/1 30/25/1
f 31/317/1 30/25/1 63/26/1
f 31/317/1 63/26/1 32/28/1
f 1/318/1 32/28/1 33/29/1
f 1/318/1 33/29/1 2/31/1
f 2/31/1 34/30/1 3/33/1
f 3/33/1 35/32/1 4/35/1
f 4/35/1 36/34/1 5/37/1
f 5/37/1 37/36/1 6/39/1
f 6/39/1 38/38/1 7/41/1
f 7/41/1 39/40/1 8/43/1
f 9/319/1 8/43/1 41/44/1
f 9/319/1 41/44/1 10/46/1
f 10/46/1 42/45/1 11/48/1
f 12/50/1 11/48/1 44/49/1
f 13/52/1 12/50/1 45/51/1
f 14/320/1 13/52/1 46/53/1
f 14/320/1 46/53/1 15/55/1
f 16/57/1 15/55/1 48/56/1
f 17/314/1 16/57/1 49/1/1
f 81/121/2 82/58/2 113/60/2
f 82/58/2 83/61/2 114/59/2
f 115/62/2 83/61/2 116/64/2
f 84/63/2 85/65/2 116/64/2
f 85/65/2 86/67/2 117/66/2
f 118/68/2 86/67/2 119/70/2
f 87/69/2 88/71/2 119/70/2
f 88/71/2 89/73/2 120/72/2
f 89/73/2 90/75/2 121/74/2
f 90/75/2 91/77/2 122/76/2
f 91/77/2 92/79/2 123/78/2
f 92/79/2 93/81/2 124/80/2
f 93/81/2 94/83/2 125/82/2
f 126/84/2 94/83/2 127/86/2
f 95/85/2 96/87/2 127/86/2
f 96/87/2 65/89/2 128/88/2
f 65/89/2 66/91/2 97/90/2
f 66/91/2 67/93/2 98/92/2
f 67/93/2 68/95/2 99/94/2
f 100/96/2 68/95/2 101/98/2
f 69/97/2 70/99/2 101/98/2
f 70/99/2 71/101/2 102/100/2
f 103/102/2 71/101/2 104/104/2
f 72/103/2 73/105/2 104/104/2
f 73/105/2 74/107/2 105/106/2
f 74/107/2 75/109/2 106/108/2
f 107/110/2 75/109/2 108/112/2
f 108/112/2 76/111/2 109/114/2
f 109/114/2 77/113/2 110/116/2
f 78/115/2 79/117/2 110/116/2
f 111/118/2 79/117/2 112/120/2
f 80/119/2 81/121/2 112/120/2
f 27/321/3 28/122/3 91/124/3
f 28/322/4 29/125/4 92/127/4
f 29/323/5 30/128/5 93/130/5
f 30/324/6 31/131/6 94/133/6
f 31/325/7 32/134/7 95/136/7
f 32/326/8 1/137/8 96/139/8
f 1/327/9 2/140/9 65/142/9
f 2/328/10 3/143/10 66/145/10
f 3/329/11 4/146/11 67/148/11
f 4/330/12 5/149/12 68/151/12
f 5/331/13 6/152/13 69/154/13
f 6/332/14 7/155/14 70/157/14
f 7/333/15 8/158/15 71/160/15
f 8/334/16 9/161/16 72/163/16
f 9/335/17 10/164/17 73/166/17
f 10/336/18 11/167/18 74/169/18
f 11/337/19 12/170/19 75/172/19
f 12/338/20 13/173/20 76/175/20
f 13/339/21 14/176/21 77/178/21
f 14/340/22 15/179/22 78/181/22
f 15/341/23 16/182/23 79/184/23
f 16/342/24 17/185/24 80/187/24
f 17/343/25 18/188/25 81/190/25
f 18/344/26 19/191/26 82/193/26
f 19/345/27 20/194/27 83/196/27
f 20/346/28 21/197/28 84/199/28
f 21/347/29 22/200/29 85/202/29
f 22/348/30 23/203/30 86/205/30
f 23/349/31 24/206/31 87/208/31
f 24/350/32 25/209/32 88/211/32
f 25/351/33 26/212/33 89/214/33
f 26/352/34 27/215/34 90/217/34
f 39/353/31 103/218/31 40/220/31
f 38/354/30 102/221/30 39/223/30
f 37/355/29 101/224/29 38/226/29
f 36/356/28 100/227/28 37/229/28
f 35/357/27 99/230/27 36/232/27
f 34/358/26 98/233/26 35/235/26
f 33/359/25 97/236/25 34/238/25
f 64/360/24 128/239/24 33/241/24
f 63/361/23 127/242/23 64/244/23
f 62/362/22 126/245/22 63/247/22
f 61/363/21 125/248/21 62/250/21
f 60/364/20 124/251/20 61/253/20
f 59/365/19 123/254/19 60/256/19
f 58/366/18 122/257/18 59/259/18
f 57/367/17 121/260/17 58/262/17
f 56/368/16 120/263/16 57/265/16
f 55/369/15 119/266/15 56/268/15
f 54/370/14 118/269/14 55/271/14
f 53/371/13 117/272/13 54/274/13
f 52/372/12 116/275/12 53/277/12
f 51/373/11 115/278/11 52/280/11
f 50/374/10 114/281/10 51/283/10
f 49/375/9 113/284/9 50/286/9
f 48/376/8 112/287/8 49/289/8
f 47/377/7 111/290/7 48/292/7
f 46/378/6 110/293/6 47/295/6
f 45/379/5 109/296/5 46/298/5
f 44/380/4 108/299/4 45/301/4
f 43/381/3 107/302/3 44/304/3
f 42/382/34 106/305/34 43/307/34
f 41/383/33 105/308/33 42/310/33
f 40/384/32 104/311/32 41/313/32

Some files were not shown because too many files have changed in this diff Show More