3041 Commits

Author SHA1 Message Date
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
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
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
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 1.0.27X4824 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 1.0.27X4816 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 1.0.27X4809H1 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 1.0.27X4809 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