Commit Graph
163 Commits
Author SHA1 Message Date
tterrag1098 2da606eb7a Call init() during config reloads 2015-07-27 15:02:20 -04:00
tterrag1098 c3ed76885c Remove Optional annotation on config reload 2015-07-11 16:00:38 -04:00
tterrag1098 4ad7b364f7 Merge remote-tracking branch 'origin/master' into endercore
Conflicts:
	src/main/java/crazypants/enderio/conduit/ConduitRecipes.java
	src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java
	src/main/java/crazypants/enderio/gui/IconButtonEIO.java
	src/main/java/crazypants/enderio/machine/MachineRecipes.java
	src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java
	src/main/java/crazypants/enderio/machine/enchanter/GuiEnchanter.java
	src/main/java/crazypants/enderio/machine/farm/FarmersRegistry.java
	src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java
	src/main/java/crazypants/enderio/material/MaterialRecipes.java
	src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java
	src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java
	src/main/java/crazypants/gui/GuiContainerBase.java
	src/main/java/crazypants/gui/GuiScreenBase.java
	src/main/java/crazypants/gui/IGuiScreen.java
	src/main/java/crazypants/gui/ToolTipManager.java
	src/main/java/crazypants/util/FluidUtil.java
2015-06-21 12:29:39 -04:00
Matthias Mann 4203014011 #2591 add some peaceful recipe alternatives 2015-06-17 22:46:52 +02:00
Matthias Mann 12c883c6fd cleanup of powered spawner, don't show slots in capture mode 2015-06-02 23:56:33 +02:00
tterrag1098 6324c7ee69 Merge branch 'master' into endercore
Conflicts:
	src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java
	src/main/java/crazypants/enderio/config/Config.java
	src/main/java/crazypants/enderio/item/darksteel/PacketUpgradeState.java
	src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java
	src/main/java/crazypants/enderio/machine/PacketProgress.java
	src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java
	src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java
	src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java
	src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java
	src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java
	src/main/java/crazypants/enderio/machine/tank/TankFluidRenderer.java
	src/main/java/crazypants/enderio/machine/tank/TileTank.java
	src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java
	src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java
	src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java
	src/main/java/crazypants/gui/GuiContainerBase.java
	src/main/java/crazypants/util/BlockCoord.java
2015-05-20 10:35:59 -04:00
tterrag1098 789fa1f345 Centralize config sync packet, sync telepad lock configs 2015-05-18 20:57:36 -04:00
tterrag1098 a9c73b70d4 Improve telepad power usage curve and add configs for values 2015-05-18 20:45:16 -04:00
downslope7 6ac625e62d Fix config typos, closes #2447 2015-05-09 17:53:40 -05:00
RAnders00 b0783a2291 Fix typos in configuration file. Fixes #2440
I was not able to find the "level" misspells, sorry. It looks like the issue creator had a outdated configuration file, I just looked over a freshly generated file and could not locate any "level" misspells.
2015-05-08 21:49:31 +02:00
tterrag1098 4f10d69c1c Merge remote-tracking branch 'origin/master' into endercore
Conflicts:
	src/main/java/crazypants/enderio/gui/TooltipAddera.java
2015-05-05 13:19:12 -04:00
Henry Loenwind a1fcc934b4 More Config for Magnet
* Config values re #2387 (defaults unchanged)
* Fix to @Optional.Method annotation might help with #2414 #2246
2015-05-04 17:56:13 +02:00
tterrag1098 7bbadc67c5 Remove EnderCore code and port to using EnderCore 2015-04-29 22:47:32 -04:00
tterrag1098 0cc68ee4ac Merge pull request #2301 from Lilylicious/travelanchor
Elevator functionality and sneak activation
2015-04-29 17:21:02 -04:00
Dwargkiller c3f31ec2f4 Travel Anchor Elevators 2015-04-29 22:26:57 +02:00
tterrag1098 8452a8ca96 Merge pull request #2329 from HenryLoenwind/torcherino
New: Config value to disable upticking
2015-04-28 15:44:49 -04:00
HenryLoenwind 93ba2428a2 New: Config value to disable upticking
* Config value to have machines reject an update rate that is higher
than the global tick rate.
* Default is unchanged (allow).
2015-04-20 22:11:29 +02:00
Matthias Mann 4975c3365a increase item extraction cost 2015-04-20 19:47:04 +02:00
Matthias Mann d17e59eb06 now the inventory panel requires nutrient distillation to work 2015-04-20 05:05:43 +02:00
HenryLoenwind f2f6bdd325 Unify code to fill/empty buckets, Part 2
* New: Emptying buckets
* Fix: Fixed many bugs, including some item-loss types
* Full IN+OUT: Tank, Reservoir, XP Obelisk, Soul Binder
* IN for input liquid, OUT for output liquid: Vat
* IN for fuel, OUT fro XP: KillerJoe
* IN for fuel: Zombie Generator
* IN for fuel/coolant: Combustion Generator
2015-04-12 23:18:58 +02:00
tterrag1098 79516999fe Refactor obelisk packages and some cleanup 2015-04-12 04:18:15 -04:00
HenryLoenwind 5ba0a1d7f3 New Config: Blacklist items from Magnet
* By default it blacklists AE2's crystal seeds, Botania's livingrock and
Mana Tablet
2015-04-06 01:26:24 +02:00
tterrag1098 433acee90a Merge pull request #1927 from HenryLoenwind/shears_darkSteelOnly
Dark Steel Shears
2015-04-05 16:45:07 -04:00
tterrag1098 06528517fd Add configs to lock telepad text fields, fix spin animation 2015-04-02 14:08:38 -04:00
HenryLoenwind cd2d6cf73e Dark Steel Shears
* Dark Steel Shears are crafted with 2 Dark Steel Ingots
* They are configurable more durable and configurable faster
* They can be empowered and will then AOE with a configurable radius
* I plan on adding another upgrade later (diamond edge)
2015-03-24 02:32:32 +01:00
tterrag1098 752342d15d Implement Mekanism v8 gas API, in the process move mek API to src/api 2015-03-22 16:39:41 -04:00
Henry Loenwind 139544af3e Added bone meal support to farming station
* 2 new slots for bone meal
* Will try to use it on everything thats on the field and cannot be
harvested
* Different RF usage for successful and unsuccessfull tries
* Fix: Output slots no longer accept seeds
* Fix: "Only one tool per slot" policy works again
2015-03-20 03:16:23 +01:00
Henry Loenwind 593c395ad7 More shearing tweaks
* Shearing ratio is now dynamic, between 10% at empty supply slot and
100% at the configured reserve
* Harvested seeds/sappling are added to the supply slot for the quarter
they were harvested from, then the others in order
2015-03-19 21:20:43 +01:00
HenryLoenwind 4988a16aeb Shear less when low on saplings
* New config setting for sapling reserve amount.
* When there are less than reserver amount saplings, only half the
leaves will be sheard, the other half will be harvested for saplings.
2015-03-18 22:44:03 +01:00
Matthias Mann e79f012a87 made despawn protection time configurable, set default to the (per comment) intended 2 minutes 2015-02-22 22:30:24 +01:00
Matthias Mann c6ddec37e7 #991 add item filters and range control to vacuum chest 2015-02-08 16:17:33 +01:00
tterrag1098 d836f76722 Finish weather obelisk functionality and add configs 2015-02-07 19:34:34 -05:00
Adaptivity dbf38c7a47 Localize GUIs 2015-01-26 17:08:52 +03:00
tterrag1098 83eee6beb0 Some more default hoes 2015-01-23 00:07:35 -05:00
Matthias Mann 1a35e6df71 #1703 added Forestry upgrades to the Dark Steel Armor 2015-01-21 22:13:11 +01:00
tterrag1098 1101a8073f Merge pull request #1592 from hilburn/master
Unique Wither Skeleton Entity
2015-01-10 19:18:24 -05:00
Matthias Mann 256ebc8195 added MagicCrops' hoes to default whitelist 2015-01-10 16:26:58 +01:00
hilburn 77a9c0f42a Adds config for Wither 2015-01-07 00:57:22 +00:00
Matthias Mann eee6e98c52 allow to configure XP juice ID, take value from OpenBlocks' config if possible 2015-01-05 00:14:10 +01:00
hilburn 0286245a5e Added config. Line of Sight req for Killer Joe
checks front face and adjacent 2 sides for line of sight to target
before attacking
also ignores players in creative mode because that was just a waste of
nutrient
2015-01-03 03:20:57 +00:00
Matthias Mann 3482229a67 added AE2 and ProjectRed hoes to the farm station's white list 2015-01-02 12:44:58 +01:00
tterrag1098 9fa3d5d645 Allow dark steel armor to charge other mods' armors 2015-01-02 01:33:59 -05:00
hilburn c4cec0a0ff Fixes
Changes powerInMachines to use long as apparently that can be a thing -
prevents overflow
Fixes some typos
Changes the Set to List
2014-12-31 17:34:40 +00:00
hilburn e658c41746 Fixes #1538 and minor performance improvements 2014-12-31 10:50:41 +00:00
hilburn 6072a1e56e Merge remote-tracking branch 'upstream/master' 2014-12-31 10:34:31 +00:00
hilburn 16b546c2b2 Eep config copy-paste fail 2014-12-31 10:16:24 +00:00
tterrag1098 9fc63d98c2 Add farm hoe whitelist 2014-12-30 23:19:16 -05:00
tterrag1098 a819618a47 Add config for harvesting jungle wood when cocoa exists 2014-12-30 15:29:22 -05:00
hilburn 944c924222 Added Cocoa and Mana Beans to Farmer
Added Cocoa Farmer
Added Mana Bean Farmer
Mana bean farm config option to turn off
also fixed some typos
Farmer was merging beans with different aspects because they are only
differentiated by NBT, overwrote getNumCanMerge to fix that in
TileFarmStation as it seems unnecessary in other machines and would
increase overhead for no appreciable gain
2014-12-30 01:12:08 +00:00
CrazyPants f1189ff65b Dark Steel Pick will now apply the obsidian efficiency boost on all hard blocks (can be changed in the config) 2014-12-12 16:43:17 +08:00