5648 Commits

Author SHA1 Message Date
Adrian Siekierka
1c163dd701 un-revert application.conf comment fixes 2023-05-30 20:30:26 +02:00
Adrian Siekierka
555ae0e695 Revert "Migrate Internet Card to Apache HTTPClient, fix #3364"
This reverts commit 9f1d521e4a6f4d75ce7460a7ef4ccd6bd29fbf45.
2023-05-30 20:28:43 +02:00
Adrian Siekierka
4cbe57d250 start work on 1.8.1 2023-05-11 15:28:39 +02:00
boubou19
5096a3141c
Merge pull request #99 from asiekierka/gtnh-oc-1.8.0
Update mainline to 1.8.0 stable
2023-05-07 12:45:47 +02:00
Adrian Siekierka
bee0788bb9 Merge branch 'master-MC1.7.10' into HEAD 2023-05-07 11:21:31 +02:00
Adrian Siekierka
8fb006a666 fix #3596 1.7.10-forge/1.8.0 2023-05-07 11:01:29 +02:00
Adrian Siekierka
dc6a57940f
Merge pull request #3597 from deVDem/master-MC1.7.10
Update ru_RU.lang
2023-05-07 10:12:00 +02:00
Adrian Siekierka
cf07d3e06a
Merge pull request #3585 from 5kuper/patch-3
Add Roboheart from OMORI to robot names
2023-05-07 10:11:56 +02:00
Adrian Siekierka
3e3e64460d add Nano to robot names 2023-05-07 10:07:19 +02:00
Adrian Siekierka
c7c9601475 fix #3603 2023-05-07 10:04:41 +02:00
Adrian Siekierka
d3d887f22f fix #3609 2023-05-07 09:57:02 +02:00
Adrian Siekierka
f8cb77e441 fix #3591, possibly 2023-05-07 09:54:37 +02:00
Adrian Siekierka
25773cc5eb fix #3588 2023-05-07 09:54:37 +02:00
Martin Robertz
564a8b85bb
Merge pull request #98 from GTNewHorizons/MFUrange
Increase MFU range from 3 to 16 blocks
2023-05-01 11:29:21 +02:00
Sampsa
8f959fc0dc Increase MFU range from 3 to 16 blocks 2023-05-01 12:14:50 +03:00
Martin Robertz
681cfa2f67
Merge pull request #97 from GTNewHorizons/feature/dependency-gt
Make GT dependency optional
2023-04-28 22:26:40 +02:00
repo_alt
fbcfc73eb9 untangle AE2 dependency 2023-04-28 23:16:55 +03:00
repo_alt
30903fecdc Make GT dependency optional 2023-04-28 17:16:14 +03:00
Martin Robertz
9028d243c2
Merge pull request #96 from GTNewHorizons/dep
update Dependencies
2023-04-27 20:05:12 +02:00
Martin Robertz
d616e32b2c
update bs 2023-04-27 19:55:26 +02:00
Martin Robertz
137e8dd2bb
update bs 2023-04-27 19:54:18 +02:00
Martin Robertz
94d2989da1
update dep file 2023-04-27 19:52:41 +02:00
Martin Robertz
32bf5674d9
Merge pull request #95 from GTNewHorizons/feature/resetRedstone
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/12990
2023-04-16 21:23:38 +02:00
repo_alt
d03178618e https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/12990
Opencomputers can break Wireless Redstone channels
2023-04-16 21:24:21 +03:00
Martin Robertz
dd29222e08
Merge pull request #94 from GTNewHorizons/fix-pattern
Fix patterns count
2023-03-19 10:31:52 +01:00
LewisSaber
4d878025d4 Remove unneded input 2023-03-19 00:50:51 +02:00
LewisSaber
f9efb66f08 Fix patterns count
bs update
2023-03-19 00:46:48 +02:00
Martin Robertz
8f6014bbd0
Merge pull request #93 from GTNewHorizons/fix-missing-natives
Fix missing natives
2023-02-18 18:58:53 +01:00
Raven Szewczyk
797564d423 Fix missing natives
Closes <https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/12633>
2023-02-18 17:15:56 +00:00
Martin Robertz
308775205a
Merge pull request #92 from GTNewHorizons/feature/LSC-fix
Added string versions of getStoredEU/getEUCapacity for huge values
2023-02-17 22:01:57 +01:00
repo_alt
2d7e24b61a Added string versions of getStoredEU/getEUCapacity for huge values 2023-02-17 23:52:13 +03:00
Martin Robertz
105de312ee
Merge pull request #91 from GTNewHorizons/rfg-injection-fix
Update buildscript, fix version not being replaced
2023-02-14 21:49:55 +01:00
Martin Robertz
649a17ead4
Merge branch 'master' into rfg-injection-fix 2023-02-14 21:49:47 +01:00
Martin Robertz
b5aeb12be9
Merge pull request #90 from GTNewHorizons/feature/me_upgrade
Ported ME Robot Upgrade from EC2 (with some code cleanup)
2023-02-14 21:49:06 +01:00
Raven Szewczyk
31b0474d0a Update buildscript, fix version not being replaced 2023-02-14 20:29:30 +00:00
Martin Robertz
fd3e02c87b
update dep file 2023-02-14 21:13:43 +01:00
repo_alt
345add975e Ported ME Robot Upgrade from EC2 (with some code cleanup) 2023-02-13 20:45:24 +03:00
Raven Szewczyk
1e1e0a7c2e [ci skip] upgraded build system 2023-01-31 09:55:03 +00:00
Jason Mitchell
b02f96e8ee [ci skip] RFG fixes 2023-01-29 09:28:28 -08:00
Jason Mitchell
fa6957fdd3 [ci skip] Update buildscript to RetroFuturaGradle 2023-01-28 20:57:33 -08:00
Martin Robertz
209ca10b7d
Merge pull request #89 from GTNewHorizons/keybinds
keybinds
2023-01-27 21:49:38 +01:00
Alexdoru
cf82e3d7e2 unbind keybind by default 2023-01-27 21:48:38 +01:00
Martin Robertz
86d3267a64
Merge pull request #88 from GTNewHorizons/feature/tps_card_unify
Use dimension ids instead of indices
2023-01-25 20:47:17 +01:00
repo_alt
8f6339377b Use dimension ids instead of indices
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/12340
2023-01-23 23:20:06 +03:00
Martin Robertz
30d63b5ec7
Merge pull request #87 from GTNewHorizons/glowredman-patch-1
Fix compilation error
2023-01-16 22:41:47 +01:00
glowredman
05b540c0ce
Fix compilation error 2023-01-16 21:32:30 +00:00
Martin Robertz
72552574f4
Merge pull request #86 from GTNewHorizons/glowredman-patch-1
Set coremod as childmod
2023-01-16 22:20:17 +01:00
glowredman
c68132f019
Set coremod as childmod 2023-01-16 20:51:25 +00:00
Roman Medvedev
358fb80a30 Update ru_RU.lang
Added some missed translations
2023-01-12 16:10:45 +03:00
Martin Robertz
3f84af6f30
Merge pull request #85 from skizzerz/master
Add OC drivers for Essentia import/export bus
2023-01-07 12:53:51 +01:00