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

Update to gtceu master #13

Merged
merged 93 commits into from
Nov 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
43b75c5
Remove NuclearCraft ASM (#2467)
kumquat-ir May 4, 2024
f189493
Update zh_cn.lang (#2445)
iouter May 5, 2024
46d2dc0
Allow polarizing block -> magnetic block (#2469)
ALongStringOfNumbers May 5, 2024
d006d60
Fusion bloom fix & other bloom effect API modifications (#2470)
Tictim May 7, 2024
8c2f0c6
Inital Vintagium Support (#2463)
htmlcsjs May 7, 2024
e0a2465
Fix Ore Dict Ingredients When Changing OreDicts with CT & GS (#2456)
IntegerLimit May 7, 2024
f8c1a52
Fix the large turbine rotor texture (#2485)
M-W-K Jun 2, 2024
00f3b4d
Small QoL Bee Update (#2458)
Rundas01 Jun 2, 2024
9ce8a20
Fix excessive packets & re-renders with AEHostable parts (#2487)
M-W-K Jun 2, 2024
5c501fd
Allow dynamic hatch placement on Distillation Tower (#2477)
M-W-K Jun 4, 2024
4d3a39e
Add a faster recipe for drilling fluid with distilled water (#2484)
Zorbatron Jun 4, 2024
153ebab
Fix input busses saying "Item Auto-Output Enabled" instead of "Item A…
Zorbatron Jun 4, 2024
09e44d9
fix pyrolyse speed (#2449)
TechLord22 Jun 4, 2024
ec756bb
Brute-force Fix of RAM Usage Problem When Using Alfheim (#2475)
MCTian-mi Jun 4, 2024
97dd250
Clean up AEHostable part fix (#2488)
M-W-K Jun 4, 2024
1328835
Various Cleanroom Improvements (#2480)
vrejhead Jun 4, 2024
72e2ef2
Updating bees using the new Mutation Condition (#2486)
Rundas01 Jun 5, 2024
71816dd
Allow MTEs / recipe map workables to directly control their JEI categ…
M-W-K Jun 6, 2024
fa7b5c4
Rounds energy displayed by TOP (#1063)
Quarri6343 Jun 8, 2024
a68d66f
dependency updates
serenibyss Jun 9, 2024
132a449
Allow recipe logic to set EU/t and speed discounts (#2496)
serenibyss Jun 18, 2024
5ff7cdb
Convert from ASM to Mixins (#2192)
ALongStringOfNumbers Jun 20, 2024
b22bd78
Glass tube recycling (#2509)
Zorbatron Jun 22, 2024
2811c8e
Improve assembly line laser render (#2495)
M-W-K Jun 22, 2024
5af02a3
Dynamically change the direction of the arrow in "Manual IO Mode" to …
Zorbatron Jun 22, 2024
18a0bbc
Support Creative Mode Pick Block (#2428)
ghzdude Jun 22, 2024
981fbaa
Add Polybenzimidazole Block Conversion Recipes (#2511)
IntegerLimit Jun 29, 2024
fe65538
GroovyScript 1.1.0 (#2506)
brachy84 Jul 2, 2024
e4a86be
Update build script version to 1720106721 (#2503)
serenibyss Jul 4, 2024
bb7659e
workaround GHA bug for tests workflow
TechLord22 Jul 4, 2024
375af9e
Fix liquid and gas registry key functions overlapping (#2514)
bruberu Jul 4, 2024
e79ad8f
Namespaced MTE Registries (#2505)
TechLord22 Jul 4, 2024
e1f1440
Split assembler and circuit assembler textures (#2388)
M-W-K Jul 4, 2024
5dceed5
bump GHA versions (#2516)
TechLord22 Jul 5, 2024
837b2ab
Fix failing builds due to Vintagium (#2519)
TechLord22 Jul 5, 2024
f7ad0bc
Fix Mixin Warnings About `maxShiftBy` (#2520)
ghzdude Jul 5, 2024
e61a066
fix invalid actions files
TechLord22 Jul 6, 2024
3d94434
Improvement to DT hatch logic (#2524)
M-W-K Jul 7, 2024
a706c39
Update ru_RU lang for 2.8.9 (#2523)
marisathewitch Jul 7, 2024
52c835c
Update Gradle and related files (#2522)
ALongStringOfNumbers Jul 7, 2024
ae88e46
Fix the lighter behaviour (#2526)
MCTian-mi Jul 7, 2024
4c1f89f
Fix EUt usage of HPCA with custom higher tier Components (#2512)
Synthitic Jul 7, 2024
f149a18
bump GRS and CT versions in gradle (#2528)
TechLord22 Jul 7, 2024
dd6f3e3
Fix Miner Pipe Deleting TileEntities (#2529)
ghzdude Jul 7, 2024
69d4e4a
Make drums no longer require a Material (#2527)
TechLord22 Jul 8, 2024
7799009
fix crash with Forestry integration (#2531)
TechLord22 Jul 8, 2024
fa281c8
fix MTE data fixer registry conflicts (#2515)
TechLord22 Jul 14, 2024
b6eec3c
Adjust EV coil recipe & texture (#2518)
Firyst Jul 14, 2024
e8259d5
Add Overload to `where()` in FactoryBlockPattern (#2538)
ghzdude Jul 14, 2024
75735fa
Update to MUI 2.5.0-RC1 (#2544)
ghzdude Jul 20, 2024
bee5a11
fix most gases using the wrong translation key (#2545)
TechLord22 Jul 20, 2024
e0a7e53
Sub-tick OC and long EUt in recipe logic (#2432)
TechLord22 Jul 26, 2024
9f3bb32
MTE registries datafixer for BQu (#2547)
TechLord22 Jul 26, 2024
20bb302
Titanium Tweaks (#2366)
serenibyss Jul 26, 2024
69489e1
SimpleMachineMetaTileEntity makes it easy to change the logo (#2289)
tier940 Jul 28, 2024
a7fce26
Fix Spray Can offhand tooltip applying to Solvent (#2546)
ALongStringOfNumbers Aug 1, 2024
520a05e
Add addElement() to material event class (#2560)
brachy84 Aug 2, 2024
427867f
Fix Output Bus not Notifying in Certain Conditions (#2558)
ghzdude Aug 2, 2024
48d707a
Override getItem in BlockMachine.class (#2555)
MCTian-mi Aug 2, 2024
8514191
Improve material element api (#2561)
brachy84 Aug 2, 2024
85834cb
fission: natural uranium and plutonium (#2562)
TechLord22 Aug 3, 2024
d302eda
Update zh_cn.lang (#2552)
iouter Aug 4, 2024
e96f99c
Fix PA & Cleanroom Sync Issues (#2566)
IntegerLimit Aug 7, 2024
a8480b5
Fix the no distinct buses button (#2577)
M-W-K Aug 8, 2024
4c6a43a
fission: hafnium and zirconium (#2563)
TechLord22 Aug 10, 2024
fbc0f91
remove usages of NonNullList (#2581)
TechLord22 Aug 10, 2024
7ca48a9
Add Missing Side Only Annotations (#2579)
IntegerLimit Aug 11, 2024
9fde08c
Fix Legacy Filter NBT Reading (#2570)
ghzdude Aug 11, 2024
dde9598
Update build script version to 1723428048 (#2532)
serenibyss Aug 12, 2024
f8db435
Fission Reactor's ShapeInfo support for Relative Directions (#2576)
bruberu Aug 14, 2024
3aee29a
Fix incorrect pipe material (#2589)
IncandescenceSy Aug 22, 2024
518a896
fix duplicate assembly line research entries (#2584)
TechLord22 Aug 22, 2024
cc0e414
Give MTEs a owner on placement (#2540)
Synthitic Sep 4, 2024
00034fb
Add OCing past MAX and fix multi Laser and Substation Hatch support (…
IncandescenceSy Sep 8, 2024
0b8263d
unbind framebuffer object after use in renderFullImageInFBO (#2614)
TechLord22 Sep 12, 2024
18672ff
Fix MTE Initial Sync sending the wrong data (#2587)
ghzdude Sep 12, 2024
e086960
Fix Issues with Filter Label and MTE Owner Overloads (#2613)
ghzdude Sep 12, 2024
b580ca9
Remove mui0 null returns (#2621)
M-W-K Sep 19, 2024
52f68e0
Make Ender Cover and Virtual Registry Abstract (#2510)
ghzdude Sep 19, 2024
24c08a9
Update ru_ru.lang and Initial Ukranian langluage (#2602)
marisathewitch Sep 19, 2024
a91b37e
Update zh_cn.lang (#2593)
iouter Sep 19, 2024
e62a382
Add a config option for the magnet's attraction delay (#2616)
Zorbatron Sep 19, 2024
11f752a
Attempt to fix tools from addon materials (#2585)
ALongStringOfNumbers Sep 19, 2024
4479f8f
Port the GT5u ME hatch wirecutter behavior (#2618)
Zorbatron Sep 19, 2024
efd8617
clean up recipe property storage (#2607)
TechLord22 Sep 19, 2024
8a062da
fix recipes having null cleanrooms (#2625)
TechLord22 Sep 22, 2024
c3a02b5
tierByVoltage optimizations (#2617)
TechLord22 Sep 22, 2024
ad02d8e
move MAX+ tiers into VOCN and VOCNF arrays (#2615)
TechLord22 Sep 22, 2024
ca583bc
fix tierByVoltage MAX tier off by one (#2626)
TechLord22 Sep 22, 2024
c7fa6db
Fix hover texture not being applied to button theme (#2623)
miozune Sep 22, 2024
ec182a9
Update PropertyContainer.java (#2627)
tong-ge Sep 29, 2024
e972d01
merged from gtceu master
tekcay Nov 27, 2024
6829b8d
restored neodymium physical properties
tekcay Nov 27, 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
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//version: 1707682661
//version: 1723428048
/*
* DO NOT CHANGE THIS FILE!
* Also, you may replace this file at any time if there is an update available.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -558,9 +558,8 @@ public static void register() {

Neodymium = new Material.Builder(66, gregtechId("neodymium"))
.ingot().fluid().ore()
.physicalProperties(
.color(0x646464).iconSet(METALLIC).physicalProperties(
new PhysicalProperties.Builder().thermalConductivity(17).mp(1295).bp(3347).oxidizes())
.color(0x646464).iconSet(METALLIC)
.flags(STD_METAL, GENERATE_ROD, GENERATE_BOLT_SCREW)
.element(Elements.Nd)
.rotorStats(7.0f, 2.0f, 512)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,42 +176,7 @@ public long getMaxVoltage() {
private static void queryTestRecipe(AbstractRecipeLogic arl) {
// put an item in the inventory that will trigger recipe recheck
arl.getInputInventory().insertItem(0, new ItemStack(Blocks.COBBLESTONE, 16), false);
// Inputs change. did we detect it ?
MatcherAssert.assertThat(arl.hasNotifiedInputs(), is(true));
arl.trySearchNewRecipe();
MatcherAssert.assertThat(arl.invalidInputsForRecipes, is(false));
MatcherAssert.assertThat(arl.previousRecipe, notNullValue());
MatcherAssert.assertThat(arl.isActive, is(true));
MatcherAssert.assertThat(arl.getInputInventory().getStackInSlot(0).getCount(), is(15));

// Save a reference to the old recipe so we can make sure it's getting reused
Recipe prev = arl.previousRecipe;

// Finish the recipe, the output should generate, and the next iteration should begin
arl.update();
MatcherAssert.assertThat(arl.previousRecipe, is(prev));
MatcherAssert.assertThat(AbstractRecipeLogic.areItemStacksEqual(arl.getOutputInventory().getStackInSlot(0),
new ItemStack(Blocks.STONE, 1)), is(true));
MatcherAssert.assertThat(arl.isActive, is(true));

// Complete the second iteration, but the machine stops because its output is now full
arl.getOutputInventory().setStackInSlot(0, new ItemStack(Blocks.STONE, 63));
arl.getOutputInventory().setStackInSlot(1, new ItemStack(Blocks.STONE, 64));
arl.update();
MatcherAssert.assertThat(arl.isActive, is(false));
MatcherAssert.assertThat(arl.isOutputsFull, is(true));

// Try to process again and get failed out because of full buffer.
arl.update();
MatcherAssert.assertThat(arl.isActive, is(false));
MatcherAssert.assertThat(arl.isOutputsFull, is(true));

// Some room is freed in the output bus, so we can continue now.
arl.getOutputInventory().setStackInSlot(1, ItemStack.EMPTY);
arl.update();
MatcherAssert.assertThat(arl.isActive, is(true));
MatcherAssert.assertThat(arl.isOutputsFull, is(false));
MatcherAssert.assertThat(AbstractRecipeLogic.areItemStacksEqual(arl.getOutputInventory().getStackInSlot(0),
new ItemStack(Blocks.STONE, 1)), is(true));
}
}
Loading