Martin Robertz
|
7a648d1d15
|
Merge pull request #30 from D-Cysteine/master-MC1.7.10
Update Forestry version
|
2021-08-15 10:13:25 +02:00 |
|
D-Cysteine
|
e6527330d7
|
Update Forestry version
|
2021-08-14 19:05:41 -06:00 |
|
Martin Robertz
|
30d6615c99
|
Merge pull request #29 from D-Cysteine/master-MC1.7.10
Add dimension to machine position debug statements
|
2021-07-25 22:39:24 +02:00 |
|
D-Cysteine
|
19e66fe35e
|
Add dimension to machine position debug statements
|
2021-07-24 19:50:27 -06:00 |
|
Martin Robertz
|
20219b42ba
|
Merge pull request #27 from repo-alt/master-MC1.7.10
Make fluid transfer speed configurable
|
2021-06-03 11:27:25 +02:00 |
|
repo_alt
|
8d357101c7
|
Make fluid transfer speed configurable
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/7919
|
2021-06-02 16:41:10 +03:00 |
|
Martin Robertz
|
d972b29a78
|
Merge pull request #26 from GTNewHorizons/add-ic2-teleporter-driver
add abilety to change ic2 teleporter coords
|
2021-01-29 20:17:25 +01:00 |
|
DreamMasterXXL
|
b61475b23d
|
fix name
|
2021-01-29 20:15:44 +01:00 |
|
korneel vandamme
|
034ff8190c
|
add abilety to change ic2 teleporter coords
|
2021-01-26 22:12:04 +01:00 |
|
repo-alt
|
aa997512dc
|
Merge pull request #25 from repo-alt/master-MC1.7.10
Dire Autocrafting table support
|
2021-01-24 19:45:16 +03:00 |
|
repo_alt
|
334253061d
|
Dire Autocrafting table support
|
2021-01-24 19:42:26 +03:00 |
|
PrismaticYT
|
00b8d190fb
|
Fix five-year-old typo
(cherry picked from commit f74d7d230eac640b080774b6bf8dc02b3cfde30c)
|
2021-01-18 17:40:03 +01:00 |
|
repo-alt
|
05c702c0d6
|
Merge pull request #24 from repo-alt/master-MC1.7.10
fixed AE network iterator being unsafe
|
2021-01-11 21:49:39 +03:00 |
|
repo_alt
|
6a062f1821
|
fixed AE network iterator being unsafe if the network changes when iterating (iteration may not fit in one tick, even if not suspended)
updated AE dependency
|
2021-01-11 21:45:43 +03:00 |
|
repo-alt
|
2eed2f5573
|
Merge pull request #23 from repo-alt/master-MC1.7.10
AE itemstack size may be larger that int
|
2021-01-01 22:00:18 +03:00 |
|
repo_alt
|
5f03fd3696
|
AE itemstack size may be larger that int
|
2021-01-01 21:48:25 +03:00 |
|
repo-alt
|
572e9d179a
|
Merge pull request #22 from repo-alt/master-MC1.7.10
Added geolyzer function to get underground oil info
|
2021-01-01 16:16:33 +03:00 |
|
repo_alt
|
4797485dc2
|
Added geolyzer function to get underground oil info
updated GT and EIO references
|
2021-01-01 16:12:58 +03:00 |
|
repo-alt
|
8d81073eca
|
Merge pull request #21 from repo-alt/master-MC1.7.10
Network items iterator
|
2020-11-18 00:57:52 +03:00 |
|
repo_alt
|
2dc597d21f
|
Network items iterator
|
2020-11-18 00:55:20 +03:00 |
|
repo-alt
|
f3c861b14e
|
Merge pull request #20 from repo-alt/master-MC1.7.10
Apparently blood orb may have null NBT
|
2020-11-15 23:33:08 +03:00 |
|
repo_alt
|
b41f3bf283
|
Apparently blood orb may have null NBT
|
2020-11-15 23:31:38 +03:00 |
|
Martin Robertz
|
dea93bd5e8
|
Merge pull request #19 from glowredman/master-MC1.7.10
Add some localizations
|
2020-10-11 12:15:17 +02:00 |
|
glowredman
|
2b109f1349
|
Add some localizations
|
2020-10-11 02:16:23 +02:00 |
|
repo-alt
|
262a61df4c
|
Merge pull request #18 from repo-alt/master-MC1.7.10-original
Wand aspect list display added
|
2020-10-01 04:50:14 +03:00 |
|
repo_alt
|
2546a72236
|
Wand aspect list display added
|
2020-10-01 04:45:20 +03:00 |
|
Martin Robertz
|
ad3f68a2af
|
Merge pull request #17 from botn365/patch-2
fix selecting fluidhandler with transfer fluids
|
2020-09-29 06:53:58 +02:00 |
|
botn365
|
b59b599c60
|
fix selecting fluidhandler
fix if you picked a fluidhandler that is not the first one will still transfer the firsts fluid instead of selected fluid
|
2020-09-27 08:06:13 +02:00 |
|
Martin Robertz
|
150fbec4ba
|
Merge pull request #16 from botn365/patch-1
alow nbt reading from research station
|
2020-09-19 16:10:53 +02:00 |
|
botn365
|
150436f4c2
|
alow nbt reading from research station
allow the reading of data sticks generated with the reasearch station
|
2020-09-19 00:17:10 +02:00 |
|
repo-alt
|
36d8bcb936
|
Merge pull request #15 from repo-alt/feature/PatternEditing
AE Pattern editing
|
2020-08-16 22:53:56 +03:00 |
|
repo_alt
|
51e1afe163
|
AE Pattern editing
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/6406
|
2020-08-16 22:52:45 +03:00 |
|
repo-alt
|
a4a9d1a10c
|
Merge pull request #14 from repo-alt/master-MC1.7.10
data stick may have null nbt
|
2020-07-20 16:35:10 +03:00 |
|
repo_alt
|
f99044ad18
|
data stick may have null nbt
|
2020-07-20 16:33:16 +03:00 |
|
payonel
|
3141b56472
|
allow numbers in gsub pattern, as lua does
closes #1999
(cherry picked from commit f73dd9eaca421af783a8c97cc36d0a73977bde8a)
|
2020-07-18 19:52:05 +02:00 |
|
payonel
|
650639530a
|
vt ABCD default is 1
closes #3320
(cherry picked from commit a84506b8605f859048bd6ed0f6c38574a145ad46)
|
2020-07-18 19:51:55 +02:00 |
|
payonel
|
50f5713bfd
|
send palette change update
(cherry picked from commit f74af9cafe257dea80fadaa52d41d63654ae2a81)
|
2020-07-18 19:51:40 +02:00 |
|
DreamMasterXXL
|
21ce8b11cb
|
bump version
|
2020-06-07 00:09:23 +02:00 |
|
Martin Robertz
|
ed1ad59b2f
|
Merge pull request #13 from repo-alt/master-MC1.7.10
GT Assembly line recipe reading
|
2020-06-06 23:43:12 +02:00 |
|
repo_alt
|
a5a9976a8c
|
GT Assembly line recipe reading
|
2020-06-07 00:38:20 +03:00 |
|
Martin Robertz
|
350784c38d
|
Merge pull request #12 from repo-alt/master-MC1.7.10
pull upstream
|
2020-06-06 20:10:32 +02:00 |
|
repo_alt
|
5da24ad9e5
|
Merge remote-tracking branch 'remotes/origin/master-MC1.7.10' into master-MC1.7.10
|
2020-06-06 20:47:21 +03:00 |
|
Martin Robertz
|
93e8d8ca15
|
Merge pull request #11 from repo-alt/feature/prospector-support
Added Seismic Prospector data reading support
|
2020-06-06 19:26:44 +02:00 |
|
repo_alt
|
ebfb80c5a6
|
Added Seismic Prospector data reading support
|
2020-06-06 20:06:27 +03:00 |
|
Fingercomp
|
ab13cec942
|
Rewrite the ru_RU translation of a manpage
|
2020-06-04 15:13:06 -07:00 |
|
payonel
|
cd0f9fa731
|
fixed the floppy gui to update its buttons
and cleaned up the packet handler to make sure reads are done regardless of outcome
|
2020-05-31 01:32:59 -07:00 |
|
DreamMasterXXL
|
e9e6cfda25
|
bump version
|
2020-05-24 16:23:04 +02:00 |
|
Martin Robertz
|
217c3b0814
|
Merge pull request #10 from Kiwi233/master-MC1.7.10
Update zh_CN.lang
|
2020-05-24 13:07:28 +02:00 |
|
[Kiwi233]
|
08c16ea118
|
Update zh_CN.lang
|
2020-05-24 19:04:27 +08:00 |
|
payonel
|
91847a44e5
|
pass wget user-agent, in a special opencomputers way
closes #3305
|
2020-05-24 02:32:36 -07:00 |
|