Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Crash with Universal wireless terminal #728

Open
wants to merge 150 commits into
base: rv6-1.12
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
150 commits
Select commit Hold shift + click to select a range
16a64c0
Fix #296
I-Enderlord-I Mar 30, 2017
4374c5e
Update PowerItem.scala
I-Enderlord-I Mar 30, 2017
84332d6
Merge pull request #441 from I-Enderlord-I/patch-1
DrummerMC Nov 4, 2017
091ab4d
Fix #398 - OreDictionaryExportBus not working with craftable items
codewarrior0 Jan 30, 2018
2d35dcf
Merge pull request #1 from codewarrior0/fix-398
codewarrior0 Jun 24, 2018
3ad3a73
Updated OC version and fixed resulting incompatibilities.
wkalinin Apr 25, 2019
4e2ba1d
Merge pull request #2 from repo-alt/OC-upgrade
Dream-Master Apr 26, 2019
1d63ce9
Added GTNH Maven & Ivy links
wkalinin May 13, 2019
7f0de25
Merge pull request #3 from repo-alt/OC-upgrade
Dream-Master May 13, 2019
826f863
Added direct (optional) dependency on CoFHCore to avoid name clash wi…
wkalinin May 14, 2019
d3f9d91
Merge pull request #4 from repo-alt/OC-upgrade
Dream-Master May 14, 2019
f0cb843
add libs folder
Dream-Master May 14, 2019
9d645d6
Make fluid interface check for it's status before giving crafting ite…
DeForce Jun 29, 2019
87460c0
Aligned light level amount of terminals to be on AE2 levels.
DeForce Jun 29, 2019
31fb39f
Show Empty Fluid Pattern in NEI
DeForce Jul 5, 2019
de3fc8d
Fix partial fluid output from storage buses
DeForce Jul 6, 2019
0cf4dc6
Merge pull request #5 from DeForce/fix-channels
Dream-Master Jul 6, 2019
ce54e36
Merge pull request #6 from DeForce/align-light-levels
Dream-Master Jul 6, 2019
cd687f2
Merge pull request #7 from DeForce/show-empty-pattern
Dream-Master Jul 6, 2019
84ad523
Merge pull request #8 from DeForce/fix-liquid-craft
Dream-Master Jul 6, 2019
1e9c57f
update build properties
Dream-Master Jul 8, 2019
b41636f
Refactor fluid storage bus logic (can work with multiple fluids, and …
DeForce Jul 8, 2019
18f8ea0
Fix Storagebus fluid dupe
DeForce Jul 8, 2019
f7ff6b0
Merge pull request #9 from DeForce/fix-storage-bus-dupe
Dream-Master Jul 9, 2019
a25a68b
Merge pull request #10 from DeForce/storage-bus-refactor
Dream-Master Jul 9, 2019
691faa6
bump version
Dream-Master Jul 9, 2019
a339a01
Implement Crafting Storages using new cells
DeForce Jul 19, 2019
8a84047
Merge pull request #11 from DeForce/extra-storage
Dream-Master Jul 19, 2019
455cd3c
bump version
Dream-Master Jul 19, 2019
a5d6540
Fix terminal dupe issue
DeForce Jul 19, 2019
4808f4f
Bigger oredict filter
DeForce Jul 19, 2019
3c2ab4e
Fluid emitter reactive update
DeForce Jul 19, 2019
301d866
Fluid Colors
AndreySolodovnikov Jan 4, 2019
86091e2
Remove NBT Data on item drop
DeForce Jul 20, 2019
d6a3e31
Remove Enchantment colors from items
DeForce Jul 20, 2019
27c28cc
Merge pull request #12 from DeForce/gui-improvements
Dream-Master Jul 20, 2019
ca9ee01
bump version and delete unused jars
Dream-Master Jul 20, 2019
40e919c
Fixed:
Nov 23, 2019
04990e1
Merge pull request #13 from JinXiuying/master
Dream-Master Nov 23, 2019
67780b6
bump version
Dream-Master Nov 23, 2019
3a7bc94
Fix fluid interface dupe
Glease May 3, 2020
c34f85c
Update zh_CN.lang
May 24, 2020
6a8be4b
Merge pull request #14 from Kiwi233/rv2
Dream-Master May 24, 2020
0c5f36a
bump version and ae2 dependencies
Dream-Master May 24, 2020
7befee5
downgrade ae version for build in jenkins
Dream-Master May 24, 2020
cf0481b
gradle updated
repo-alt Jun 19, 2020
071b89e
Merge pull request #15 from repo-alt/feature/OreDictionaryBusExtended…
Dream-Master Jun 20, 2020
5641079
fix fluid terminal scroll event
Aeldunari Aug 4, 2020
9462dd2
Merge pull request #16 from longyup/rv2
Dream-Master Aug 4, 2020
b9b7825
fixed driver detection code
repo-alt Aug 17, 2020
284bc28
Merge branch 'rv2' of https://github.com/GTNewHorizons/ExtraCells2 in…
repo-alt Aug 17, 2020
44cddc1
fixed driver detection code
repo-alt Aug 17, 2020
9dfbed5
Merge branch 'rv2' of https://github.com/GTNewHorizons/ExtraCells2 in…
repo-alt Aug 17, 2020
c9909d6
Enable early regex detection, so that split would not break them.
repo-alt Oct 30, 2020
415ad8c
Merge pull request #20 from repo-alt/rv2
Dream-Master Nov 1, 2020
e7228cd
fix ec2 voiding some part of items when inserting in more than one slots
Skiftcha Nov 18, 2020
782f310
review fix
Skiftcha Nov 18, 2020
b69f333
Merge pull request #21 from Skiftcha/fix-item-voiding
Dream-Master Nov 18, 2020
b037d7b
bump version
Dream-Master Dec 3, 2020
aca86ed
Refactored Oredictionary export bus to use internal AE item stack hash
repo-alt Dec 26, 2020
d002748
Merge pull request #23 from repo-alt/rv2
Dream-Master Dec 26, 2020
0878325
Drastically improve Fluid Storage Bus performance
PanSzelescik Dec 29, 2020
b538234
Merge pull request #24 from PanSzelescik/rv2
Dream-Master Dec 30, 2020
e39a648
obsolete API removed (ThE jar is in the libs anyway)
repo-alt Jan 8, 2021
de78dd1
obsolete API removed (ThE jar is in the libs anyway)
repo-alt Jan 8, 2021
e8cc89b
remove the registration of the fluid pattern for every fluid
boubou19 Jan 8, 2021
c919418
Merge pull request #26 from boubou19/rv2
Dream-Master Jan 8, 2021
edcdbf5
Merge branch 'rv2' of https://github.com/GTNewHorizons/ExtraCells2 in…
repo-alt Jan 8, 2021
4951237
Gradle updated, AE2 API updated, oredictionary filter support added t…
repo-alt May 5, 2021
484f3ac
Merge pull request #29 from repo-alt/rv2
Dream-Master May 5, 2021
dfdf558
add(Extra Cells)Changelog
Dream-Master Jun 27, 2021
3521c47
reuse generated pattern if possible in fluid interface
Glease Jun 29, 2021
9be6262
Merge pull request #31 from GTNewHorizons/fluid-interface-optimize
Dream-Master Jun 29, 2021
5b93d77
update build
bombcar Dec 2, 2021
be98b18
Merge pull request #32 from GTNewHorizons/yabbadabbadooo
Dream-Master Dec 2, 2021
ea0018a
fix jitpack
bombcar Dec 2, 2021
3652c00
we don't need deobf we have dev
bombcar Dec 2, 2021
7caf3b7
Merge pull request #33 from GTNewHorizons/yabbadabbadooo
Dream-Master Dec 2, 2021
3088344
try again to get a reasonable maven out of jitpack
bombcar Dec 2, 2021
04fa8b5
Merge pull request #34 from GTNewHorizons/yabbadabbadooo
Dream-Master Dec 2, 2021
95bc59d
update readme
bombcar Dec 3, 2021
cc7cf76
cofh is pulled in via other dependencies
bombcar Dec 3, 2021
2ffe580
Merge pull request #35 from GTNewHorizons/bombcar-patch-1
bombcar Dec 3, 2021
0a4e110
Merge pull request #36 from GTNewHorizons/cleanup
Dream-Master Dec 3, 2021
d8c8a47
bump version
Dream-Master Dec 11, 2021
5d2f502
Remove copied APIs
Dec 19, 2021
0c99716
Migrated to unified build script
Dec 19, 2021
8480812
Merge pull request #37 from GTNewHorizons/unified-build-script
Dream-Master Dec 20, 2021
1b6e1b5
Set dependencies to master
Dec 20, 2021
b9aac5b
Merge pull request #38 from GTNewHorizons/fix-dependency
Dream-Master Dec 20, 2021
851262a
fix version warning on load
bombcar Dec 22, 2021
6a7c60a
Merge pull request #39 from GTNewHorizons/fixversion
Dream-Master Dec 23, 2021
84e785e
fix broken cache clear
GlodBlock Jan 5, 2022
9c4c60a
remove clear in wrong place
GlodBlock Jan 5, 2022
565a89f
Merge pull request #40 from GTNewHorizons/fix-1
Dream-Master Jan 5, 2022
8db4b38
maven publish buildscript update
mitchej123 Jan 18, 2022
6755837
update to explicit dependencies
mitchej123 Jan 19, 2022
daa92cf
Update ru_RU.lang
Eldrinn-Elantey Jan 28, 2022
99acb4c
Delete walrus.obj
Eldrinn-Elantey Jan 28, 2022
c264ec3
Revert "Delete walrus.obj"
Eldrinn-Elantey Jan 29, 2022
090295e
Update ru_RU.lang
Eldrinn-Elantey Jan 29, 2022
9ac1081
Merge pull request #41 from Eldrinn-Elantey/master
Dream-Master Jan 29, 2022
9ada834
check drain fluid type before return
GlodBlock Feb 3, 2022
382f112
Merge pull request #43 from GTNewHorizons/dupe-1
Dream-Master Feb 3, 2022
bbe8afd
Fix call gui on server-side
xstmass Feb 4, 2022
c8eb8a5
Merge pull request #44 from xstmass/master
Dream-Master Feb 5, 2022
faef126
update build
bombcar Feb 7, 2022
bf69643
consistency
bombcar Feb 7, 2022
578325b
Merge pull request #46 from GTNewHorizons/updatebuild
Dream-Master Feb 7, 2022
0c070fe
update deps
bombcar Feb 8, 2022
cd7f649
deps (#48)
bombcar Feb 8, 2022
8d96b89
Wallsharingrus (#50)
bombcar Feb 14, 2022
6d8cb1b
A bunch of EC2 bugfixes (#51)
eigenraven Apr 17, 2022
664b95f
Fix EC2 handling of IC2 Cells and show fluid amounts in fluid termina…
eigenraven Apr 20, 2022
6cc4c78
Fix fluid interface ticking every tick, even when it has nothing to d…
eigenraven Apr 21, 2022
22e8bed
Fix truncating fluid amounts to 32-bit ints in the fluid terminal (#53)
eigenraven Apr 21, 2022
e2469e1
Resilient AE operations: get rid of duplication/voiding possibilities…
eigenraven Apr 23, 2022
08dcc70
Item cell idle drain based on the size of the cell using the new API.…
eigenraven May 6, 2022
75e398a
Fix interface pattern item pushing (#57)
eigenraven Jun 19, 2022
1f325f2
Fix missing null check in the fluid import bus (#58)
eigenraven Jun 21, 2022
1eb5b24
[ci skip] Migrate github actions to GTNH-Actions-Workflows
mitchej123 Jul 16, 2022
2d5de93
Fix NPE in PartFluidImport.java (#60)
karmaBonfire Aug 16, 2022
e7f896b
Add two new advanced ME storage cells that handle bytes as Longs (#61)
S4mpsa Aug 18, 2022
a71843f
Add priority button and NEI drag support to fluid storage bus (#59)
GlodBlock Aug 18, 2022
727785d
Add void cell (#63)
S4mpsa Aug 21, 2022
db6b2b8
Fix DnD Real Item as Ghost (#64)
slprime Aug 23, 2022
751d06a
Update some features (#67)
asdflj Sep 1, 2022
8ccd1de
Fixed fluid in terminal showing negative numbers (#68)
asdflj Sep 2, 2022
46d2e08
Update zh_CN.lang (#69)
Kiwi233 Sep 24, 2022
625f0d4
Add number formatting for EC2 cells (#70)
Connor-Colenso Sep 26, 2022
60fcea9
EC2 Parts rendering consistent to AE2 (#71)
dipo33 Oct 11, 2022
fb83d9a
fluid emitter and import export bus support nei drag and drop (#73)
asdflj Nov 23, 2022
e9fbc8d
Update BS+SA
Dream-Master Nov 24, 2022
4d11877
Fix build (#74)
kuba6000 Nov 26, 2022
5855893
remove pointless allocations (#75)
Glease Dec 11, 2022
767211a
fix fluid storage gui bug (#78)
asdflj Dec 20, 2022
56ab8fb
Update buildscript + apply spotless (#79)
D-Cysteine Jan 28, 2023
05f318e
[ci skip] Update buildscript to RetroFuturaGradle
eigenraven Jan 29, 2023
df4ad8e
[ci skip] spotlessApply with the new settings
eigenraven Jan 29, 2023
425fbf7
[ci skip] Add git-blame-ignore-revs for spotlessApply
eigenraven Jan 29, 2023
b9ec121
RFG Scala fix
eigenraven Jan 29, 2023
9be9a39
[ci skip] upgraded build system
eigenraven Jan 31, 2023
95e692c
add warning tooltip (#80)
GlodBlock Feb 2, 2023
fb658ec
Self destruct. (FStorage bus, FImport/Export bus, and more) (#81)
firenoo Mar 11, 2023
1e73690
Fix typo in warning (#82)
shpaass May 2, 2023
f461150
[ci skip] upgraded build system
eigenraven Jan 8, 2024
94c03de
[ci skip] upgraded build system
eigenraven Feb 4, 2024
00b9c4f
update
Dream-Master Jul 30, 2024
d37e77e
Adjust to AE2 api changes (#83)
Demiu Aug 4, 2024
06bf418
update
Dream-Master Aug 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 22 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# This is the universal Text Editor Configuration
# for all GTNewHorizons projects
# See: https://editorconfig.org/

root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.{bat,ini}]
end_of_line = crlf

[*.{dtd,json,mcmeta,md,sh,svg,xml,xsd,xsl,yaml,yml}]
indent_size = 2

[*.lang]
trim_trailing_whitespace = false
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Ignore spotlessApply reformat
df4ad8e370d65b575411a271c7e827e72db09fe8
44 changes: 44 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
* text eol=lf

*.[jJ][aA][rR] binary

*.[pP][nN][gG] binary
*.[jJ][pP][gG] binary
*.[jJ][pP][eE][gG] binary
*.[gG][iI][fF] binary
*.[tT][iI][fF] binary
*.[tT][iI][fF][fF] binary
*.[iI][cC][oO] binary
*.[sS][vV][gG] text
*.[eE][pP][sS] binary
*.[xX][cC][fF] binary

*.[kK][aA][rR] binary
*.[mM]4[aA] binary
*.[mM][iI][dD] binary
*.[mM][iI][dD][iI] binary
*.[mM][pP]3 binary
*.[oO][gG][gG] binary
*.[rR][aA] binary

*.7[zZ] binary
*.[gG][zZ] binary
*.[tT][aA][rR] binary
*.[tT][gG][zZ] binary
*.[zZ][iI][pP] binary

*.[tT][cC][nN] binary
*.[sS][oO] binary
*.[dD][lL][lL] binary
*.[dD][yY][lL][iI][bB] binary
*.[pP][sS][dD] binary
*.[tT][tT][fF] binary
*.[oO][tT][fF] binary

*.[pP][aA][tT][cC][hH] -text

*.[bB][aA][tT] text eol=crlf
*.[cC][mM][dD] text eol=crlf
*.[pP][sS]1 text eol=crlf

*[aA][uU][tT][oO][gG][eE][nN][eE][rR][aA][tT][eE][dD]* binary
33 changes: 33 additions & 0 deletions .github/scripts/test-no-error-reports.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!/usr/bin/env bash

RUNDIR="run"
CRASH="crash-reports"
SERVERLOG="server.log"

if [[ -d $RUNDIR/$CRASH ]]; then
echo "Crash reports detected:"
cat $RUNDIR/$CRASH/crash*.txt
exit 1
fi

if grep --quiet "Fatal errors were detected" $SERVERLOG; then
echo "Fatal errors detected:"
cat server.log
exit 1
fi

if grep --quiet "The state engine was in incorrect state ERRORED and forced into state SERVER_STOPPED" $SERVERLOG; then
echo "Server force stopped:"
cat server.log
exit 1
fi

if ! grep --quiet -Po '.+Done \(.+\)\! For help, type "help" or "\?"' $SERVERLOG; then
echo "Server didn't finish startup:"
cat server.log
exit 1
fi

echo "No crash reports detected"
exit 0

13 changes: 13 additions & 0 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@

name: Build and test

on:
pull_request:
branches: [ master, main ]
push:
branches: [ master, main ]

jobs:
build-and-test:
uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/build-and-test.yml@master
secrets: inherit
14 changes: 14 additions & 0 deletions .github/workflows/release-tags.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@

name: Release tagged build

on:
push:
tags: [ '*' ]

permissions:
contents: write

jobs:
release-tags:
uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/release-tags.yml@master
secrets: inherit
44 changes: 32 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,32 @@
/*
!/.gitignore
!/src
!/gradle
!/gradlew
!/gradlew.bat
!/README.md
!/License.txt
!/build.gradle
!/build.bat
!/build.sh
!/build.properties
.gradle
.settings
/.idea/
/.vscode/
/run/
/build/
/eclipse/
.classpath
.project
/bin/
/config/
/crash-reports/
/logs/
options.txt
/saves/
usernamecache.json
banned-ips.json
banned-players.json
eula.txt
ops.json
server.properties
servers.dat
usercache.json
whitelist.json
/out/
*.iml
*.ipr
*.iws
src/main/resources/mixins.*.json
*.bat
*.DS_Store
!gradlew.bat
Empty file removed .gitmodules
Empty file.
45 changes: 45 additions & 0 deletions CHANGELOG-2.1.1.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@

# ExtraCells2

Changelog of ExtraCells2.


### [#23 Refactored Oredictionary export bus to use internal AE item stack hash](https://github.com/GTNewHorizons/ExtraCells2/pull/23)
**Merge pull request #23 from repo-alt/rv2**
* Refactored Oredictionary export bus to use internal AE item stack hash

[d0027489e7c8bda](https://github.com/GTNewHorizons/ExtraCells2/commit/d0027489e7c8bda)
by Martin Robertz *2020-12-26 17:28:02*
### [#24 Drastically improve Fluid Storage Bus performance](https://github.com/GTNewHorizons/ExtraCells2/pull/24)
**Merge pull request #24 from PanSzelescik/rv2**
* Drastically improve Fluid Storage Bus performance

[b5382340b4c23d2](https://github.com/GTNewHorizons/ExtraCells2/commit/b5382340b4c23d2)
by Martin Robertz *2020-12-30 16:40:31*
### [#26 remove the registration of the fluid pattern for every fluid](https://github.com/GTNewHorizons/ExtraCells2/pull/26)
**Merge pull request #26 from boubou19/rv2**
* remove the registration of the fluid pattern for every fluid

[c9194185a749887](https://github.com/GTNewHorizons/ExtraCells2/commit/c9194185a749887)
by Martin Robertz *2021-01-08 21:58:28*
### No issue
**remove the registration of the fluid pattern for every fluid**

[e8cc89baca7d2db](https://github.com/GTNewHorizons/ExtraCells2/commit/e8cc89baca7d2db)
by boubou19 *2021-01-08 16:27:32*

**obsolete API removed (ThE jar is in the libs anyway)**

[de78dd1b8ac1e51](https://github.com/GTNewHorizons/ExtraCells2/commit/de78dd1b8ac1e51)
by repo_alt *2021-01-08 15:30:19*

**Drastically improve Fluid Storage Bus performance**

[08783250828df18](https://github.com/GTNewHorizons/ExtraCells2/commit/08783250828df18)
by PanSzelescik *2020-12-29 17:19:33*

**Refactored Oredictionary export bus to use internal AE item stack hash**

[aca86edcb261ca9](https://github.com/GTNewHorizons/ExtraCells2/commit/aca86edcb261ca9)
by repo_alt *2020-12-26 14:40:59*

3 changes: 3 additions & 0 deletions CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Any Github changes require admin approval
/.github/** @GTNewHorizons/admin

File renamed without changes.
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
ExtraCells 2
==========

A mighty Add-On for Applied Energistics 2
A mighty Add-On for Applied Energistics 2.

To build this, download the project (ZIP or fork or whatever) and execute the build.bat/build.sh. The build files will be in /build/lib/

Thanks to arbrarsyed for ForgeGradle, to AlgorithmX2 for his massive support and his *amazing* API, cyntain and tgame14 for some very cool textures and Vexatos, crafteverywhere, SSCXM and VeryBigBro for the cool localizations!

Dmod: [![Build Status](http://shadowcity.net:8080/job/ecrv2/badge/icon)](http://shadowcity.net:8080/job/ecrv2/)

ExtraCells 2 is licensed under the MIT license.
ExtraCells 2 is licensed under the MIT license. This is the GTNH fork.
1 change: 0 additions & 1 deletion build.bat

This file was deleted.

Loading