Skip to content

Fix all remaining dupe bugs and known crashes #52

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.

Sign up for GitHub

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

Open
makotech222 wants to merge 23 commits into
base: master
Choose a base branch
from
Open

Fix all remaining dupe bugs and known crashes #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e0a3cab
Fixed dark UI issue on newer versions of Forge
Jan 24, 2015
f950429
Fix Exception when searching in search tab. Remove duplicate recipes
makotech222 Apr 9, 2015
da5517f
Merge pull request #1 from makotech222/fixes
makotech222 Apr 9, 2015
2d39d74
a
makotech222 Apr 11, 2015
98c885a
Merge pull request #2 from makotech222/fixes
makotech222 Apr 11, 2015
82debde
Major optimizations to recipe tree traversal - new code takes .336 sec
planetguy32 May 12, 2015
f24a56f
Fixed foreach in actually crafting things. ++responsiveness
planetguy32 May 12, 2015
7084621
Merge branch 'loldude' of https://github.com/loldudester/EasyCrafting…
planetguy32 May 12, 2015
1c0d42c
Merge branch 'loldudester-loldude'
planetguy32 May 12, 2015
5a85a39
Merge pull request #3 from planetguy32/master
makotech222 May 14, 2015
70c2a81
Added a means to stop infinite loops caused by recursive recipes.
planetguy32 May 14, 2015
634f7b2
Keep recursion check minimal - wool slab check is unnecessary
planetguy32 May 14, 2015
59c56ee
Change focus on search field
makotech222 May 15, 2015
363a6f3
Merge pull request #4 from planetguy32/master
makotech222 May 15, 2015
6409d05
Merge pull request #5 from makotech222/fixes
makotech222 May 15, 2015
a84ce02
Revert Searchfield changes. Fix getConsumers
makotech222 May 17, 2015
041a140
Merge pull request #2 from makotech222/master
planetguy32 May 17, 2015
0c045ba
Replaced old recipe loop check with a more comprehensive (but slightly
planetguy32 Jun 6, 2015
ff3318b
fix inventory update event
serhiicherepanov Jun 7, 2015
505b9b3
Merge pull request #3 from minecraftclub/master
planetguy32 Jun 7, 2015
05ff543
Added timeout to help find recipe loops
planetguy32 Jun 7, 2015
e557c21
Ore-dictionary-based item removal filter
planetguy32 Jun 7, 2015
9138b1e
Merge pull request #6 from planetguy32/master
makotech222 Jun 7, 2015
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
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,8 @@ Desktop.ini
*.iml
*.ipr
*.iws
/bin/
.classpath
/.gradle/
.project
/.settings/
2 changes: 1 addition & 1 deletion build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ filename=EasyCrafting
version=2.0.1

version_mc=1.7.10
version_forge=10.13.0.1208
version_forge=10.13.2.1291

#ftp_location=ftp://localhost/maven/
ftp_location=ftp://lepko.net/domains/lepko.net/public_html/mods/maven/
Expand Down
1 change: 1 addition & 0 deletions src/main/java/net/lepko/easycrafting/core/block/TileEntityAutoCrafting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,7 @@ public ItemStack getStackInSlotOnClosing(int slotIndex) {

@Override
public void setInventorySlotContents(int slotIndex, ItemStack stack) {
inventoryChanged = true;
inventory[slotIndex] = stack;
}

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/net/lepko/easycrafting/core/inventory/gui/GuiAutoCrafting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package net.lepko.easycrafting.core.inventory.gui;

import org.lwjgl.opengl.GL11;

import net.lepko.easycrafting.Ref;
import net.lepko.easycrafting.core.block.TileEntityAutoCrafting;
import net.lepko.easycrafting.core.inventory.ContainerAutoCrafting;
Expand Down Expand Up @@ -30,6 +32,7 @@ public void initGui() {

@Override
protected void drawGuiContainerBackgroundLayer(float tickTime, int mouseX, int mouseY) {
GL11.glColor4f(1, 1, 1, 1);
// Background
mc.renderEngine.bindTexture(GUI_TEXTURE);
drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
Expand Down
Loading