Commit Graph
194 Commits
Author SHA1 Message Date
Zoko061602 bc46a1f198 Capacitors, Conduits, Stellar Armor 2020-04-05 18:29:44 +02:00
Zoko061602 805ba22e52 Fixed Armor & new Conduit texture 2020-03-13 22:07:16 +01:00
Zoko061602 fb64552ca4 Added more 1.12 content
- Added Generators
- Added Fluids
- made grindingBalls seperate Items
- Added solar Panel 3
2020-02-08 03:20:54 +01:00
Zoko061602 548d8d3d17 Add EndSteel Armor
- Added EndSteel Armor
- Added Capacitor
- Added Empowered 5
2020-02-05 01:25:27 +01:00
yepidoodles f77f6a9fdf Fixed a spelling mistake 2016-12-03 15:14:43 +00:00
CrazyPants f66ccef5dc Merge pull request #3163 from HenryLoenwind/magnetPower
Prevent magnet from being used as battery by default
2016-05-29 00:25:33 +08:00
CrazyPants 8f05a8a48a Merge pull request #3309 from OneEyeMaker/TelePad
Added config options for TelePad
2016-05-29 00:22:58 +08:00
OneEyeMaker dba784cbea Fixed whitespace changes (hopefully) 2016-05-19 09:55:47 +03:00
OneEyeMaker 69c930eea4 Added config options for TelePad 2016-05-18 16:28:17 +03:00
Henry Loenwind af620663a9 Added new Magic Crops hoe names 2016-04-10 13:39:28 +02:00
Henry Loenwind 2448884257 Removed outdated config setting
* re #3230
2016-03-17 03:27:07 +01:00
tterrag1098 c65afd8e8b Completely rework weather obelisk. GUI and recipes not final. 2016-02-26 15:32:42 -05:00
tterrag 4d10ae129c Merge pull request #3030 from HenryLoenwind/combTheDesert
Improve handling of single-input recipes
2016-02-04 14:52:20 -05:00
HenryLoenwind bb06413fda Prevent magnet from being used as battery by default 2016-01-27 22:48:34 +01:00
CrazyPants 19f419d59e Merge pull request #2921 from HenryLoenwind/magnet438
Reworked the magnet code
2016-01-24 21:32:20 +08:00
CrazyPants 85ba17e4e9 Merge pull request #3074 from HenryLoenwind/burnYou
Made Stirling Generator more configurable
2016-01-24 21:07:51 +08:00
CrazyPants 6aac56902d Merge pull request #3073 from HenryLoenwind/hurtYou
Add options for Killer Joe on a non-PvP server
2016-01-24 20:47:09 +08:00
HenryLoenwind 075c619e4b Allow both Yeta Wrench mouse actions to be off
if there's a keybinding set.
2016-01-23 22:02:05 +01:00
HenryLoenwind 223d8c0f79 Made Stirling Generator more configurable
* Added config settings for burn time and energy multiplier
* Normalized burn rate display to base value
* Increased efficiency of octa-upgraded generator a tiny bit (6x instead
of 5.3x) to avoid oddity of having the burn time display not change with
the second upgrade
* Fixed base RF config setting not responding to runtime config changes
2015-12-21 03:17:28 +01:00
HenryLoenwind 8aeb1894d7 Added config option for farm size 2015-12-20 18:24:21 +01:00
HenryLoenwind be8d57608c Add options for Killer Joe on a non-PvP server
Default: Killer Joe swings but nothing happens
Option 1: Killer Joe ignores the player
Option 2: Killer Joe ignores the no-PvP rule
2015-12-17 22:01:39 +01:00
HenryLoenwind 4d3d59e4bb Improve handling of single-input recipes
* Single input alloy smelter recipes now will get multi-slot variants
added automatically
* There's a config flag to disable this
* Removed existing partila multi-slot recipes
* Fixed code that depends on the order of recipes in a HashMap
* Fixed code that depends on the order of machineRecipes in a HashMap
2015-11-22 16:17:11 +01:00
tterrag 5b9217335b Add the "sidebar" and "old style" yeta overlays as a config option 2015-11-20 03:41:45 -05:00
HenryLoenwind f4d97dcd09 New: OpenComputers Conduits 2015-11-17 21:35:08 +01:00
Wilhelm Schuster 3a974ac7a8 config: Add more Hoes to Farming Station whitelist 2015-11-06 01:15:01 +01:00
HenryLoenwind 511fc7f193 Reworked the magnet code
* Limit number of items the magnet hoovers at a time
* Don't use vanilla code to select items but use our specialized,
  short-circuiting version of it
2015-10-22 13:27:59 +02:00
tterrag1098 68d33efe3c Add proper locale to all toLowerCase and toUpperCase calls 2015-08-24 22:04:27 -04:00
tterrag1098 576199774f #2730 Switch all usage of MODID for textures to DOMAIN (lowercase) 2015-08-24 21:42:16 -04:00
tterrag1098 244fe1227a #2709 Add config to make inv panel free, and fix font scaling 2015-08-14 23:14:16 -04:00
tterrag1098 b64e0224e2 Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git 2015-07-27 15:02:26 -04:00
tterrag1098 2da606eb7a Call init() during config reloads 2015-07-27 15:02:20 -04:00
Matthias Mann a341b78769 the invar hoe is in ThermalFoundation 2015-07-27 20:26:10 +02: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