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

add Thermal Expansion compat #152

Merged
merged 24 commits into from
May 1, 2024
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
2bd85ee
allow recipe builder methods to be documented as commented
WaitingIdly Mar 28, 2024
b5c39be
add debug log to missing spot some likely annotations
WaitingIdly Mar 28, 2024
c2438a8
tweak internal documentation method using singleton list
WaitingIdly Mar 28, 2024
160d8be
fix minor whitespace error in generating unfinished docs
WaitingIdly Mar 28, 2024
d3d4cb2
update gs hand text
WaitingIdly Mar 29, 2024
8a5546a
add nbt matcher to fluidstack mixin
WaitingIdly Mar 29, 2024
4c50899
fix minor javadoc comment
WaitingIdly Mar 29, 2024
be916a9
add a bunch of accessors
WaitingIdly Mar 29, 2024
1fbf70e
add and implement AbstractReloadableStorage
WaitingIdly Mar 29, 2024
265dfb4
make editorconfig only indent groovy builders by 4
WaitingIdly Mar 30, 2024
78c9d6c
add the machines
WaitingIdly Mar 30, 2024
08090ef
gootbye old commented out example file
WaitingIdly Mar 30, 2024
b848543
dynamo
WaitingIdly Mar 30, 2024
28fca10
remove duplicate colon when printing missing keys
WaitingIdly Mar 30, 2024
28fb463
devices
WaitingIdly Mar 31, 2024
102d9b5
add recipebuilder examples for CentrifugeMobs
WaitingIdly Mar 31, 2024
8a5f8f1
note sawmill resin funnel augment better
WaitingIdly Mar 31, 2024
04c877b
implement add
WaitingIdly Mar 31, 2024
9747e73
add missing add lang keys
WaitingIdly Mar 31, 2024
aa12ea9
Merge branch 'master' into thermal-attempt-uhm
WaitingIdly Mar 31, 2024
701c79f
\"tree\"
WaitingIdly Mar 31, 2024
ee1b438
allow overriding #recipeStorage, javadocs for ARS
WaitingIdly Apr 3, 2024
4d949b1
Merge branch 'master' into thermal-attempt-uhm
WaitingIdly Apr 16, 2024
bd4b400
apply MethodDescription fallback to thermal
WaitingIdly Apr 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ ij_shell_switch_cases_indented = false
ij_shell_use_unix_line_separator = true

[{*.gant,*.groovy,*.gy}]
ij_continuation_indent_size = 4
ij_groovy_align_group_field_declarations = false
ij_groovy_align_multiline_array_initializer_expression = false
ij_groovy_align_multiline_assignment = false
Expand Down Expand Up @@ -593,7 +594,7 @@ ij_kotlin_wrap_elvis_expressions = 1
ij_kotlin_wrap_expression_body_functions = 0
ij_kotlin_wrap_first_method_in_call_chain = false

[{*.har,*.json,c:ingot_aluminium,mcmod.info,pack.mcmeta}]
[{*.har,*.json,mcmod.info,pack.mcmeta}]
indent_size = 2
ij_json_array_wrapping = split_into_lines
ij_json_keep_blank_lines_in_code = 0
Expand Down
63 changes: 0 additions & 63 deletions examples/postInit/thermal.groovy

This file was deleted.

Loading