Projects >> CraftBook >>e6caff81c9284f7dfd25d8fe4992e5c671b87a1a

Chunk
Conflicting content 
        return false;
    }
<<<<<<< HEAD

=======
    
    private String[] generateICText(Player p) {
        ArrayList icNameList = new ArrayList();
        icNameList.addAll(icList.keySet());
        
        Collections.sort(icNameList);
        
        ArrayList strings = new ArrayList();
        for(String ic:icNameList) {
            RegisteredIC ric = icList.get(ic);
            boolean canUse = canCreateIC(p,ic,ric);
            boolean instant = ric.type.isInstantIC;
            if(listUnusuableICs) strings.add(Colors.Rose +ic+" ("+ric.type.name+")"+
                    (instant?" (INSTANT)":"")+": "+ric.ic.getTitle()+(canUse?"":" (RESTRICTED)"));
            else if(canUse) strings.add(Colors.Rose +ic+" ("+ric.type.name+")"+
                    (instant?" (INSTANT)":"")+": "+ric.ic.getTitle());
        }
        return strings.toArray(new String[0]);
    }
    
>>>>>>> f734603fd8b53a2ca9ebdc7c9746e71107e4efb5
    /**
     * Used for the /listics command.
     *
Solution content 
        return false;
    }

    /**
     * Used for the /listics command.
     *
File
RedstoneListener.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Chunk
Conflicting content 
import java.util.HashSet;
import java.util.Set;
import java.util.logging.Level;
<<<<<<< HEAD
=======

import com.sk89q.craftbook.BlockVector;
>>>>>>> f734603fd8b53a2ca9ebdc7c9746e71107e4efb5
import com.sk89q.craftbook.InsufficientArgumentsException;
import com.sk89q.craftbook.Vector;
Solution content 
import java.util.HashSet;
import java.util.Set;
import java.util.logging.Level;
import com.sk89q.craftbook.BlockVector;
import com.sk89q.craftbook.InsufficientArgumentsException;
import com.sk89q.craftbook.Vector;
File
Util.java
Developer's decision
Version 2
Kind of conflict
Import