Projects >> mcpatcher >>95dd1cda1d3ba7496b05bb86c69fb75ac921dc75

Chunk
Conflicting content 
import org.lwjgl.opengl.GL11;

import java.awt.image.BufferedImage;
<<<<<<< HEAD
import java.io.*;
=======
import java.io.IOException;
import java.io.InputStream;
>>>>>>> 63b354e3b383adc03477320352ddb0e6a5d366f7
import java.util.*;

public class Colorizer {
Solution content 
import org.lwjgl.opengl.GL11;

import java.awt.image.BufferedImage;
import java.io.*;
import java.util.*;

public class Colorizer {
File
Colorizer.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
            }
        }
        EntitySheep.fleeceColorTable = EntitySheep.origFleeceColorTable.clone();
<<<<<<< HEAD
        textColorMap.clear();
        for (int i = 0; i < textCodeColors.length; i++) {
            textCodeColors[i] = COLOR_CODE_UNSET;
        }
=======
        
        myceliumColors = null;
>>>>>>> 63b354e3b383adc03477320352ddb0e6a5d366f7
    }

    private static void reloadColorProperties() {
Solution content 
            }
        }
        EntitySheep.fleeceColorTable = EntitySheep.origFleeceColorTable.clone();
        myceliumColors = null;
        textColorMap.clear();
        for (int i = 0; i < textCodeColors.length; i++) {
            textCodeColors[i] = COLOR_CODE_UNSET;
        }
    }

    private static void reloadColorProperties() {
File
Colorizer.java
Developer's decision
Concatenation
Kind of conflict
Attribute
For statement
Method invocation