Commit Graph

466 Commits

Author SHA1 Message Date
ShadowNinja
799c1b3409 Fix wear_represents logic 2014-05-30 21:13:14 -04:00
ShadowNinja
ebc122fb35 Remove unused parameter to is_empty() 2014-05-30 21:00:58 -04:00
ShadowNinja
7c2f2d9630 Fix crash when trying to repair unknown items 2014-05-30 20:59:59 -04:00
Zefram
b74c2d38b9 Better quarry control dialog
The size configuration is no longer cleared when exiting the dialog with
<esc>.  The enable/disable toggle button now indicates the current state.
The name of the toggle button now varies according to state, so that
pressing the button multiple times in one state (which can arise due
to lag making the user unsure about whether the first press registered)
only makes the state change that the user requested, rather than toggling
repeatedly.
2014-05-24 00:26:24 +02:00
Zefram
4d20e4473e Stop quarry duplicating items
The quarry was digging via dig_node and also manually putting the node's
drops into the tube system.  This assumed that dig_node would attempt
to put the drops in the player's inventory, doing nothing if there is
no such inventory.  With the item_drop mod installed, dig_node would
instead turn the node into an item entity, so the quarry's strategy would
duplicate the item, making it appear both as an item entity in situ and
as an item in the tube.  Instead, the quarry must use remove_node when
it manually processes the drops, just like the pipeworks node breaker.
2014-05-24 00:25:19 +02:00
Zefram
623fcae4a4 Fix supply converter
Its registration as a battery (BA) node didn't work.  It needs to be
registered as both a producer (PR) and a receiver (RE).
2014-05-24 00:24:30 +02:00
Zefram
29429f636e Only make gloop dusts if gloopores is present 2014-05-24 00:23:48 +02:00
Zefram
a5fc7ac41e Make stainless steel ingot grindable to dust
Consistent with all the other ingot/dust pairs.
2014-05-24 00:22:11 +02:00
Novatux
6a08071d86 Upgrades to battery boxes too, prevent frames from moving too often (one move every second max) 2014-05-23 19:58:41 +02:00
Zefram
68b7bcc28e split default iron/steel into three metals
Override the default mod's iron/steel substance, replacing it with three
metals: wrought iron (pure iron), carbon steel (iron alloyed with a little
carbon), and cast iron (iron alloyed with lots of carbon).  Wrought iron
is easiest to refine, then cast iron, and carbon steel the most difficult,
matching the historical progression.  Recipes that used default steel are
changed to use one of the three, the choice of alloy for each application
being both somewhat realistic and also matching up with game progression.

The default:steel{_ingot,block} items are identified specifically with
wrought iron.  This makes the default refining recipes work appropriately.
Iron-using recipes defined outside technic are thus necessarily
reinterpreted to use wrought iron, which is mostly appropriate.
Some objects are renamed accordingly.

Rather than use the default steel textures for wrought iron, with technic
providing textures for the other two, technic now provides textures for
all three metals.  This avoids problems that would occur with texture
packs that provide default_steel_{ingot,block} textures that are not
intended to support this wrought-iron/carbon-steel/cast-iron distinction.
A texture pack can provide a distinct set of three textures specifically
for the situation where this distinction is required.

Incidentally make grinding and alloy cooking recipes work correctly when
ingredients are specified by alias.
2014-05-22 20:57:50 +02:00
Novatux
ecb53e9717 Mining lasers: don't dig the node the player is in. 2014-05-18 16:11:06 +02:00
Novatux
b204090acc Fix errors when trying to charge buckets of water. 2014-05-18 14:47:05 +02:00
RealBadAngel
c7a4c05860 Fix invalid check for UI. 2014-05-06 22:11:04 +02:00
asl97
45e1f05ffc Move checking of node that should be ignore above protection checking
firing a laser into a sky while in someone land without hitting anything but air shouldn't get anyone ban
2014-05-06 04:22:51 +02:00
Vanessa Ezekowitz
30adc3b651 86400 ticks is one week, not 24h 2014-05-04 15:23:34 -04:00
roberto5
67b709744f Improve italian translation 2014-05-01 19:09:24 -04:00
Zefram
00d7c9bdea Refill behaviour for power tools and cans
Supply the on_refill hook for power tools and cans, to perform appropriate
charging.  This is to be used by unified_inventory's creative-mode
refill slot.
2014-04-30 10:49:54 +01:00
Zefram
0294fc8f3a various backward-compatibility aliases 2014-04-30 00:26:45 +01:00
Zefram
9b64ffea8c Register craft types with unified_inventory 2014-04-30 00:22:48 +01:00
Zefram
c9bf799e32 Declare unified_inventory optional dependency
Make sure unified_inventory is loaded before us if present, so that we
successfully register crafts with it.
2014-04-30 00:22:08 +01:00
Zefram
03a5375e55 Fix can wear following tool workshop change
The cans used set_RE_wear() to manage their wear bars.  As that now only
sets wear for power tools, the cans need a separate function.
2014-04-30 00:22:02 +01:00
Zefram
99fd5dfee5 Genericise handling of multiple meanings of wear
The tool workshop is meant to repair mechanical damage to tools, so
is at risk of `repairing' tools that use the wear bar to represent
something other than mechanical wear.  It had special-case recognition
of the water and lava cans, which use the wear bar to represent how much
content they're carrying, and wouldn't repair them.  But it didn't avoid
`repairing' RE chargeable items, which use the wear bar to represent
how much energy they have stored.  It would modify the wear bar without
actually affecting the charge, so the wear bar would jump back to the
correct place when the next charging or discharging event occurred.

To genericise, introduce a new item property, "wear_represents", which
indicates how the wear bar is used for this item.  Currently defined
values are "mechanical_wear" (straightforward damage to tools that
start out perfect), "technic_RE_charge" (electrical energy, canonically
represented in the meta rather than the wear bar), and "content_level"
(how full a container is).  For backcompat, nil is interpreted as
"mechanical_wear".  The tool workshop will only repair "mechanical_wear"
tools.  As a bonus, set_RE_wear() will only set the wear bar for
"technic_RE_charge" items: this means developers will notice if they
forget to declare wear_represents, but also means that with no further
changes it's possible to have an RE chargeable item that uses its wear
bar to represent something else.
2014-04-30 00:21:55 +01:00
Zefram
ca69473664 fix tube properties for injector
By relying on another no-longer-extant definition, the injector didn't
visually connect to the tube below it.
2014-04-30 00:21:36 +01:00
Zefram
1a94fdc601 fix groups for injector
The injector was in no groups, and therefore not breakable by ordinary
means.  This was because the code referred to a defined variable that
went away in the course of a rewrite of the chests code.
2014-04-30 00:21:13 +01:00
Zefram
70fb21ef36 Fix search for operating flashlight
Having a never-charged flashlight in the hotbar earlier than a charged
flashlight prevented the charged flashlight being found.
2014-04-27 14:43:31 -04:00
Zefram
5c59d97070 Fix discharge of flashlight and sonic screwdriver
These two tools wouldn't discharge all the way to zero through use,
unlike most chargeable items.

Incidentally remove a duplicate of the check_for_flashlight() function.
2014-04-27 14:43:31 -04:00
Zefram
db79675570 Fix flashlight's light generation
The flashlight was lighting the wrong node, 1 m east of the player's lower
half, thus getting no light if the player is adjacent to an eastern wall.
Restore the old 1 m above, that coincides with the player's hands.

There was a problem with light from the flashlight getting stuck in
the map.  This arises because the flashlight's light value was 15, the
reserved value that the engine uses for sunlight.  Moving the flashlight
upwards, by jumping while it is equipped, would cause the node below it to
acquire a bogus sunlit state.  Fix this by reducing the flashlight's light
value to 14 (LIGHT_MAX), which is the maximum permitted for non-sunlight.

The light_off node type is not required.  With the light value limited
to 14, mere removal of the light node suffices to correctly recalculate
lighting.
2014-04-27 14:43:31 -04:00
Zefram
60c75bce74 Fix flashlight light node declarations
The light and light_off node types should be not_in_creative_inventory,
and should drop nothing.
2014-04-27 14:43:31 -04:00
Zefram
f504178421 Fix drops for active machines
Active machine nodes need to drop their inactive counterpart.  Some were
missing that declaration.
2014-04-27 14:43:00 -04:00
Zefram
e748af927a Fix drill charge usage
The drills weren't taking the variable usage cost into account (either
the per-type base cost or the per-mode multiplier) when deciding whether
they have sufficient charge to use.  This could cause them to overshoot in
charge usage, although they would then clamp to zero rather than record
negative charge.  Also, for the Mk1 drill where the cost was assessed
correctly, the drill would refuse to discharge to exactly zero charge.
2014-04-27 14:43:00 -04:00
Zefram
04c6f5bea3 Improve message about drill control
The message to "hold shift" makes an unwarranted assumption about the
user's keybindings.  Messages from the server should refer to a key's
game function, rather than its extragame identity.
2014-04-27 14:42:59 -04:00
RealBadAngel
18cae761af The code to connect an electrical machine to cables would only consider
the first-seen tier for which the machine was registered.  So the
switching station, which is uniquely registered for all tiers, would
only visually connect to LV cable when placed, not to MV or HV cable.
(It would function nevertheless, and cable would connect to the switching
station if placed later.)  Change to consider all tiers.  Incidentally
avoid a gratuitous iteration through all registered machines.
2014-04-27 15:57:11 +02:00
asl97
628a18977b Add fir leaves to the chainsaw's timber_nodenames 2014-04-22 16:34:14 -04:00
Xanthin
39c41a06f4 Add german translations for all mods 2014-04-22 16:30:27 -04:00
Zefram
db20250371 Fix laser discharging
Commit a6dae893d6 introduced per-version
charge cost for firing mining lasers, but applies this in addition to
the old fixed cost which it was meant to replace.  Fix by removing the
application of the fixed cost.

The same commit did successfully change the check for a laser having
sufficient charge to fire, so that's based purely on the variable cost.
As a consequence, firing a laser that has just enough charge to cover the
variable cost could cause its charge to go negative.  (For example, by
fully charging a Mk1 laser and then firing it until it empties, resulting
in a charge of -400.)  It turned out that set_RE_wear handled that badly,
producing an over-100% wear value that would wrap to a *low* wear value,
leading to the laser's wear bar looking as if it's fully charged.

To protect against silly wear values, make set_RE_wear clamp the wear
value to avoid wrapping.  Handle specially the case of a fully-discharged
tool, where there was desirable wrapping to zero.
2014-04-22 12:48:55 -04:00
Boba
44dbc75b61 Fix typo in frame and template motor recipes 2014-04-14 20:54:28 -04:00
Boba
061d1a3ab4 Fix crash when using the template tool 2014-04-14 20:52:57 -04:00
ShadowNinja
7dc21cec40 Fix steel ingot item name in laser Mk1 crafting recipe 2014-04-02 23:03:51 -04:00
Bryant Mairs
5dd09aeff4 Modify mining drill charges and power usage. Also fix bug with mk3 power usage. 2014-03-30 17:40:54 -04:00
Bryant Mairs
9ab5846d56 Make the charge stored by every battery box consistent with the input ingredients. 2014-03-30 17:40:54 -04:00
Bryant Mairs
1b7fa38082 Reduce the charge stored by each type of crystal. 2014-03-30 17:40:54 -04:00
Bryant Mairs
a6dae893d6 Modify the cost, range, and cost-per-shot of all 3 lasers. 2014-03-30 17:40:54 -04:00
Bryant Mairs
49052d6f4a Revised recipe for mk1 laser and added mk2 & mk3 laser recipes. 2014-03-30 17:40:54 -04:00
Tim
252156d653 Fix CNC steel block groups 2014-03-30 14:13:11 -04:00
Tim
8684fa1733 Fix constructor description 2014-03-30 14:13:04 -04:00
Tim
8a88812b8b Make marble, granite, bronze and stainless steel blocks CNC-millable 2014-03-30 14:12:34 -04:00
Tim
0201135231 Remove duplicate CNC registration of default:tree 2014-03-30 14:09:24 -04:00
Tim
8bdbe1e451 Fix steel block node name in the CNC 2014-03-30 14:08:56 -04:00
ShadowNinja
821fba9b02 Fix CNC power drain 2014-03-26 22:34:17 -04:00
ShadowNinja
187fd90a7c Make some headers smaller in the READMEs 2014-02-27 00:32:37 -05:00
ShadowNinja
2db9121bdb Update READMEs 2014-02-27 00:30:29 -05:00
Novatux
b28001e36f Infinite stacks fix 2014-01-18 13:29:06 +01:00
Novatux
e1c995f654 Actually call the mvps callback 2014-01-18 13:29:06 +01:00
Novatux
52e7014b7c Mesecons mvps support, better frames 2014-01-18 13:29:06 +01:00
Novatux
8c1be3b48e A few fixes 2014-01-18 13:29:06 +01:00
Novatux
8fba5e1140 Make those frames able to move 2014-01-18 13:29:06 +01:00
Novatux
68f7d34e1b First tests 2014-01-18 13:29:06 +01:00
Carter Kolwey
ebc114df71 Fixed music player 2014-01-11 12:30:10 -05:00
Vanessa Ezekowitz
dc324816db fix a few more tube-based recipes 2014-01-03 22:05:35 -05:00
Vanessa Ezekowitz
749df3b581 Fix all recipes that use pipeworks pneumatic tubes to follow latest changes
in pipeworks node namining conventions.
2014-01-01 23:27:51 -05:00
ShadowNinja
93b0d25cbc Use get_string for owner string 2013-12-29 10:59:04 -05:00
ShadowNinja
8e2cb0121b Fix mining drill digging in the wrong direction 2013-12-23 16:54:21 -05:00
ShadowNinja
2df417feb7 Localize generator fuel 2013-12-23 16:38:05 -05:00
Vanessa Ezekowitz
018b248d51 fix crash in constructor 2013-12-21 02:26:19 -05:00
Vanessa Ezekowitz
f3bba0aaac move inject_items to top of file (so that it's above the abm that calls it) 2013-12-18 20:41:08 -05:00
ShadowNinja
92db8e1f76 Remove config file creation
This made it difficult to change default settings
2013-12-17 20:01:01 -05:00
ShadowNinja
dd2962aba6 Rewrite flashlight 2013-12-17 19:57:24 -05:00
ShadowNinja
d8437faebc More global localiztions 2013-12-17 19:56:01 -05:00
ShadowNinja
c5d287f5f5 Make tube sending faster 2013-12-17 14:37:02 -05:00
ShadowNinja
64db3d14d8 Remove duplicate ABM 2013-12-17 14:24:06 -05:00
ShadowNinja
bab8517b2a Add protection support to tools
This adds support to the chainsaw, mining drill, mining laser,
sonic screwdriver, and tree tap.
2013-12-17 14:22:10 -05:00
ShadowNinja
5cf765b2f1 Localize most variables 2013-12-17 13:56:37 -05:00
ShadowNinja
0ea1bd1fa2 Fix music player
Sounds not included
2013-12-16 18:57:56 -05:00
Vanessa Ezekowitz
ae235ee8f3 more pipeworks API-change updates 2013-12-15 15:49:28 -05:00
Vanessa Ezekowitz
8ef3f20c3c adapt to changes in Pipeworks API 2013-12-15 15:03:41 -05:00
ShadowNinja
f3d8b47b20 Add support for minetest.swap_node 2013-12-10 20:14:39 -05:00
ShadowNinja
818a0e5ff0 Add protection support to the sonic screwdriver 2013-12-10 19:52:40 -05:00
ShadowNinja
47b0b59884 Generators don't send items 2013-12-03 15:30:09 -05:00
SmallJoker
7a3cd49597 Add pipeworks support to generators 2013-12-03 11:22:48 -05:00
Bryant Mairs
ef70cbfbf2 Fix lava can being able to hold 16 sources 2013-12-03 11:00:41 -05:00
Bryant Mairs
37acdc77f7 Move production percentage for geothermal generators to infotext 2013-12-03 10:57:16 -05:00
ShadowNinja
a35db449b3 Fix generators 2013-11-27 16:56:09 -05:00
ShadowNinja
354ee6f313 Add missing translations 2013-11-27 16:18:52 -05:00
ShadowNinja
0809dd747e Externalize common functions and protect inventories 2013-11-27 12:28:56 -05:00
ShadowNinja
76a8acbe5b Use upvalues in registrations 2013-11-26 16:53:52 -05:00
ShadowNinja
08db41ee4d Don't allow tubing items into LV machines 2013-11-26 16:33:27 -05:00
ShadowNinja
bde49aca61 Fix crash when quarrying a protected area 2013-11-18 15:27:17 -05:00
ShadowNinja
2d8ff45d9a Fix crash with invalid radius 2013-11-15 00:54:17 -05:00
Novatux
6d31965b36 Fix bug with translations. 2013-11-11 15:37:30 +01:00
Vanessa Ezekowitz
9bc99a5d04 fix chainsaw not working 2013-11-06 23:08:28 -05:00
Novatux
f6b1d075c2 Fix crash. 2013-11-02 15:44:55 +01:00
Novatux
5ed47abee6 Remove default bronze recipe. 2013-11-01 16:16:11 +01:00
pagliaccio
f64956be4d add italian translation 2013-10-31 15:53:14 -04:00
ShadowNinja
2d7c1d7252 Readd craft recipe for the Mk1 mining laser 2013-10-30 15:18:18 -04:00
HybridDog
f90915c408 Add Mk2 and Mk3 mining lasers 2013-10-30 15:09:31 -04:00
ShadowNinja
0a5e521f2d Fix comment 2013-10-30 13:50:24 -04:00
kaeza
6df3b87290 Add spanish translation 2013-10-30 13:48:39 -04:00
ShadowNinja
be2f30a1a2 Add support for translations via intllib 2013-10-30 13:48:39 -04:00
ShadowNinja
9aee83f921 Fix generator nodemane 2013-10-28 14:37:40 -04:00
ShadowNinja
cee65bdd2a Fix crash when entering a non-number for forcefield range 2013-10-27 14:39:45 -04:00
pagliaccio
704925aa7b Add MV and HV generators and make coal dust a fuel 2013-10-27 14:39:44 -04:00
Vanessa Ezekowitz
4a35d5dd98 fix typo 2013-10-26 07:14:35 -04:00
Novatux
76879424ae Add crafts for frames and templates. 2013-10-26 09:13:55 +02:00
RealBadAngel
2a54e00677 fix typo 2013-10-25 19:45:06 +02:00
Novatux
808d382867 Better tempaltes 2013-10-19 11:28:16 +02:00
ShadowNinja
eac4844175 Fix negative tool discharging and a few other tweaks...
Disable the flashlight by default.
Use itemstack:{get,set}_{metadata,name,wear,...} rather than {to,from}_table.
Improve the style of part of the code of mischelaneous tools
2013-10-18 22:28:32 -04:00
Novatux
66e4b5ede4 Remove remaining frames.addVect 2013-10-17 18:33:21 +02:00
Novatux
a73d568e58 Bugfix 2013-10-13 16:24:17 +02:00
Novatux
48d571bd90 Add drop to templates 2013-10-13 11:09:08 +02:00
Novatux
3cf0d331f0 Make template motors have an owner and check area protection 2013-10-13 10:34:58 +02:00
Novatux
c06cdf603e Add templates 2013-10-13 10:30:14 +02:00
ShadowNinja
363f033278 Disable wind mill by default because it isn't ready yet 2013-10-06 12:42:41 -04:00
Novatux
a579ee829a Make frame motors have an owner and check area protection 2013-10-06 14:20:13 +02:00
Novatux
468d79db61 Bugfixes with energy branch.
Conflicts:
	technic/machines/switching_station.lua
2013-10-04 10:50:51 -04:00
Novatux
12d29c2139 Forgot to update on cable add/destroy+use minetest.hash_node_position because else it did not work. 2013-10-04 10:49:06 -04:00
Novatux
f4ac2b8c1e Make power distribution more efficient.
Conflicts:
	technic/machines/register/cables.lua
2013-10-04 10:48:39 -04:00
ShadowNinja
90208930e5 Create technic config file if it doesn't exist 2013-10-03 16:33:07 -04:00
ShadowNinja
562d0db20c Remove item_drop from config.lua 2013-10-03 00:27:08 -04:00
ShadowNinja
bd3cc74d05 Don't consume items or drain power when there isn't room for the results 2013-09-24 17:09:20 -04:00
ShadowNinja
ee0765804c Partial rewrite 2013-09-17 16:37:56 -04:00
Novatux
48ea6fb99d Use only 1 node for frame motors. 2013-08-31 15:04:08 +02:00
GloopMaster
f8132c13a2 Update grinder_gloopores.lua 2013-08-24 18:20:11 -04:00
sdzen
df644d7f77 Merge pull request #76 from kol0/patch-2
correct amount of energy produced
2013-08-06 17:08:22 -07:00
kol0
57dc8904a0 correction amount of energy produced
I correct amount of energy produced with descripton value.
2013-07-30 11:30:12 +02:00
Jonathan Raphael Joachim Kolberg
91329b19a4 Fixed the crafting for mining_drill mk3 2013-07-28 12:45:53 +02:00
Jonathan Raphael Joachim Kolberg
50b8aed01c Finaly fixed the statements
The idle condition for mv mashines is changed to what it should be
because sending items into the tube is done in idle, so we only care
if there is something left in src
2013-07-26 19:29:16 +02:00
RealBadAngel
d8ec3f8bbe Deployer and node breaker are now moved to pipeworks. 2013-07-25 07:59:00 +02:00
hdastwb
2d7f750d9a fixed a condition with mv machines so as to not power down machines with stuff to grind/smelt but nothing to tube out 2013-07-23 21:43:36 -04:00
RealBadAngel
e38f6f0983 Merge pull request #62 from hdastwb/connect_sides
add tube routing support
2013-07-22 23:38:39 -07:00
hdastwb
2e4d983be7 added connect_sides to appropriate tube tables 2013-07-21 17:15:03 -04:00
hdastwb
b3cf1ab693 added a recipe for MESE sand tubes 2013-07-19 17:51:24 -04:00
Jonathan Raphael Joachim Kolberg
d37cf7d536 added a mv grinder 2013-07-19 10:58:38 +02:00
RealBadAngel
acc7f71302 Commons for battery boxes 2013-07-17 19:14:40 +02:00
RealBadAngel
3bc6cad671 Remove lv, mv, and hv tiers from power tools.
Theyre already tiered with Mk1-3 (at least drill is, more in the future).
Tools can be considered as designed for different tiers of circuits thx to their power needs.
For example Mk3 will require ages to load in LV batbox.
Batboxes load tools timining: LV standard (1000EU), MV 4x faster (4000EU), HV 16x faster (16000EU)
Also since 1EU is the same in any circuit it is possible to move energy from one to another with portable devices like crystals.

Other changes:
- moved charge/discharge functions to battery_boxes_commons.lua
- added UI style backgrounds for all the batboxes
2013-07-17 19:14:01 +02:00
RealBadAngel
922d2554a9 LV batbox background 2013-07-15 21:39:31 +02:00
RealBadAngel
b7deb0db84 32x compressor textures 2013-07-15 20:23:08 +02:00
RealBadAngel
410afaa583 Add compressor 2013-07-15 20:21:49 +02:00
RealBadAngel
58e5f65234 New items by ObKo (textures) 2013-07-14 12:43:11 +02:00
RealBadAngel
58ae29c5a4 New items by ObKo 2013-07-14 12:42:38 +02:00
ShadowNinja
57cd394773 Gigh -> High 2013-07-12 20:32:38 -04:00
ShadowNinja
1f4c621ffc Fix code style of the high voltage battery box 2013-07-12 20:28:07 -04:00
ShadowNinja
187015e073 Fix coding style of nuclear reactor 2013-07-12 19:23:29 -04:00
ShadowNinja
4f35f407ce Add LuaVoxelManip support to forcefield 2013-07-12 15:41:59 -04:00
ShadowNinja
30361afb34 Fix forcefield 2013-07-12 15:07:02 -04:00
kpoppel
fa846989ac Remove file that doesn't seem to have any use.
Fix typing error in register... file
Fix two issues with nuclear reactor and set the burn time to 24h.
2013-07-11 23:01:13 +02:00
ShadowNinja
d497429abc Load tools 2013-07-11 15:11:28 -04:00
ShadowNinja
5d470cd753 Move files to subfolders 2013-07-11 12:31:00 -04:00
kpoppel
afc84d6a8d Update nuclear_reactor_hv.lua
Fix temporary recipe.
2013-07-11 14:33:03 +02:00
kpoppel
3055270a7c Add nuclear reactor
Still needs some work. I am pushing it to get ideas and feedback.
Also fix some bugs in the LV coal generator that were found while making
the nuclear reactor.

Conflicts:
	technic/init.lua
2013-07-10 21:45:56 -04:00
kpoppel
13e8857f1a Fix HV battery box and some indentation.
Bug found by pagliaccio.
2013-07-08 17:05:34 -04:00
ShadowNinja
19c9a0443b Merge branch 'indev'
Conflicts:
	technic/alloy_furnace.lua
	technic/alloy_furnaces_commons.lua
	technic/battery_box.lua
	technic/battery_box_hv.lua
	technic/battery_box_mv.lua
	technic/chainsaw.lua
	technic/cnc.lua
	technic/cnc_nodes.lua
	technic/electric_furnace.lua
	technic/grinder.lua
	technic/init.lua
	technic/solar_array_hv.lua
	technic/solar_array_lv.lua
	technic/solar_array_mv.lua
	technic/solar_panel.lua
	unified_inventory/api.lua
	unified_inventory/depends.txt
2013-07-08 16:57:56 -04:00
Konstantin Oblaukhov
8be389e774 Enriched Uranium. 2013-07-06 20:52:41 +07:00
RealBadAngel
3a3700537b Merge changes made in technic_game 2013-07-06 10:35:48 +02:00
Konstantin Oblaukhov
e606b93ac6 Support for multiple-input recipes in extractor. 2013-07-06 15:19:15 +07:00
kpoppel
85d937e199 Made the supply converter reset its supply and demand stats if the cabling is bad. 2013-07-06 00:31:48 +02:00
kpoppel
4c6546ed56 Forgot to reset demand on power failure. 2013-07-06 00:22:12 +02:00
kpoppel
ab38e29a18 Merge branch 'indev' of https://github.com/RealBadAngel/technic into indev 2013-07-06 00:19:05 +02:00
kpoppel
e64994d473 Fix a bug when digging up a small cube light.
Fix the power radiator so that it reacts correcty when power is lost.
Add punch feature to toggle all attached appliances.
2013-07-06 00:17:56 +02:00
RealBadAngel
b1d668fa3b Merge pull request #40 from m97/indev
Add extractor.
2013-07-05 06:20:28 -07:00
Konstantin Oblaukhov
b78b90d422 New textures for lumps and ingots. 2013-07-05 02:28:22 -04:00
ShadowNinja
2d168e5afc Use ores from default instead of moreores 2013-07-05 01:57:45 -04:00
Vanessa Ezekowitz
465890950b Improved cross-compatibility with homedecor's brass ingots. 2013-07-04 23:33:04 -04:00
kpoppel
73209cc37d Fix cycling power drain on the forcefield. Now it disables itself if no power. 2013-07-04 21:39:29 +02:00
kpoppel
9a0d3f2166 Forcefield now working with updated power scheme. 2013-07-04 21:33:27 +02:00
kpoppel
9770be430d Textures. I really need help on some nice ones. 2013-07-04 20:29:38 +02:00
kpoppel
6e4ffb4883 Fix item wear. 2013-07-04 19:19:45 +02:00
m97
ce5dfa311e Add extractor.
Add extractor for make more rubber from latex. Moved make dyes from
grinder to extractor.
2013-07-04 19:05:00 +02:00
kpoppel
c7207a9cba Silenced the power radiator. 2013-07-02 22:45:08 +02:00
kpoppel
7201aeb6ba Removed down_converters as they are superseeded by the new supply converter. 2013-07-02 22:26:45 +02:00
kpoppel
ee5c6c23fa Changed power distribution method and streamlined the various existing machines.
An electrical network now requires a switching station to work. This statin is the one
resolving the network collecting power and distributing it again.
Added up/down converter. It is kind of finished. It can be updated with a slot for an upgrade
but so far it works without by resolving the types of wires above and below the box.
Tool and machine registering changed to use a table with key+value instead of the iterative method it used to have.
The power radiator changed to be able to send up to 3000MV EUs in a radius of 6.

This update will most likely require existing networks to be dug up and placed again. Also the
switching station must be added.
2013-07-02 00:03:36 +02:00
RealBadAngel
8e03d7ded6 Sync with indev branch, bump version to 0.4.7 2013-06-30 07:12:02 +02:00
Diego Martínez
0039f38b94 Deployers and constructors now able to "place" craftitems. 2013-06-21 00:20:20 -03:00
kpoppel
37d9d94c44 Added case study of radiated power through inductive coils. 2013-06-19 00:24:37 +02:00
Diego Martínez
a1da74209b Constructor now digs node drops instead of actual nodes. 2013-06-18 10:46:28 -03:00
kpoppel
cfb5bd190c Added the Mv and HV down converters.
Doing that required some changes to the batteries in that they have new meta data
aligned with the other machines.
I also added a BA type machine in addition to the existing PR and RE types.
This way it is easy to find he batteries on the network.
2013-06-12 23:30:37 +02:00
kpoppel
a27b59dde5 Fix to the chainsaw. handle_node drops should no longer become nil. 2013-06-12 22:08:23 +02:00
kpoppel
802db28dc3 Whitespace cleanup 2013-06-06 22:49:08 +02:00
kpoppel
e62a0fd0c1 Changed grinding of ingots to give 1 dust. This is to avoid duplication exploit. 2013-06-06 22:46:40 +02:00
Novatux
1524a9f610 Frames destroy liquids they should replace and are not blocked by them. 2013-06-05 16:22:45 +02:00
kpoppel
26c0bba1f2 Added ingot grinding for the type which already have a <>_dust in place.
The default bronze_ingot does not have a dust item.
2013-06-04 23:36:07 +02:00
kpoppel
be774436c1 Fix solr array recipes for hv and mv to match that of the lv array. 2013-06-04 00:05:07 +02:00
kpoppel
4f1a44a80b Removing ununsed textures.
Added more safety to item_drop to get around a fatal server halt issue.
2013-06-03 23:42:44 +02:00
kpoppel
ede3978965 Added solar arrays for all voltage tiers.
Added transformers for all voltage tiers.
I changed the recipes for solar panels to make them less expensive.
I also changed the output of the individual panel and made the arrays provie the real "oomph" :-)
Solar panels and arrays are dependent on light level, time of day and height abive ground (0) for output and cheating with torches and stuff.
Textures added.
Fixed bugs in the hv battery box. It was not working at all. I don't understand the hv box top texture though???
I have a sense that all machines connected to the battery boxes are taking the same amount of juice from the box.
A method of taking a little or a lot would be nice.
2013-06-03 23:37:04 +02:00
RealBadAngel
7d890428f5 HV Battery Box textures added 2013-05-30 06:01:01 +02:00
RealBadAngel
77254735e4 Make treetap work with moretrees rubber tree.
Add moretrees as dependency
2013-05-29 03:59:25 +02:00
RealBadAngel
64207baa45 Add HV battery box 2013-05-09 16:02:02 +02:00
kpoppel
2d68498dc1 Massive change to the way CNC programs are registered.
Now the API is open for adding new nodes and inhibiting some nodes for some materials.
No more recipes outside of the CNC machine.

Code length also greatly reduced.
2013-05-08 01:42:22 +02:00
kpoppel
5940f5bda4 Slope box fixes. From Bas080. 2013-05-08 00:06:54 +02:00
kpoppel
fef948c5ac CNC can now change programs while it is working. 2013-05-07 22:51:03 +02:00
kpoppel
7f2be244f2 Add textures for active mode of CNC.
Correct two typing bug in battery_box.lua
2013-05-07 22:34:06 +02:00
kpoppel
c1df318e85 Fixes to te machine level of service. 2013-05-06 23:14:27 +02:00
kpoppel
d98405f129 Merge branch 'master' of https://github.com/kpoppel/technic 2013-05-06 20:55:33 +02:00
kpoppel
6463b77e60 Add milling machine from non cubic to technic mod.
Next step is to make sure it only works if powered.
2013-05-06 20:00:00 +02:00
ShadowNinja
00328622d9 Store configuration in the world directory. 2013-04-27 13:53:12 -04:00
RealBadAngel
31b1393b21 Add HV wireing 2013-04-27 10:04:17 +02:00
RealBadAngel
41af016603 change registering crafting recipes in UI 2013-04-15 07:56:31 +02:00
RealBadAngel
3d8b2a365d Bugfix 2013-04-15 07:54:00 +02:00
RealBadAngel
cdb368913b Update recipes 2013-04-15 07:52:11 +02:00
Novatux
3a52153cd7 Change selection_box of frames so it is easier to select them. 2013-04-13 18:17:27 +02:00
RealBadAngel
e139fff8fb Updated item_drop (now as modpack component) 2013-04-08 23:52:20 +02:00
RealBadAngel
6cb1f56fb4 dust texture 2013-04-06 14:52:36 +02:00
RealBadAngel
8d092c9ec8 fix grinding recipes and craft recipe for tool workshop 2013-04-05 22:05:54 +02:00
RealBadAngel
fd3f25b5e0 split chests off into a separate modpack component 2013-04-05 04:30:33 +02:00
RealBadAngel
0ca19dacb0 Update 0.4.6-0 2013-04-04 01:17:39 +02:00
RealBadAngel
279776ff62 update 2013-03-30 11:36:45 +01:00
RealBadAngel
edd6f8c7e9 New ores code 2013-03-28 15:50:34 +01:00
RealBadAngel
52138943ee back to old ways 2013-03-24 17:46:30 +01:00
ShadowNinja
f552406e74 Remove backup files 2013-03-24 00:05:46 -04:00
Vanessa
501b4c0d2b Screwdriver tool is obsolete now, deleted. 2013-03-23 20:59:48 -04:00
Vanessa
195e2f2229 Merge branch 'master' of git://github.com/RealBadAngel/technic 2013-03-23 13:44:26 -04:00
Vanessa
9cc10fd61b fixed ore generation. generate_ore() calls were missing the chunk size
parameter.
2013-03-23 13:40:03 -04:00
ShadowNinja
e5d48e9492 Remove unnescescary function calls from forcefields and add an enable/disable button 2013-03-21 16:06:13 -04:00
Vanessa Ezekowitz
cbe78c13c1 Merge branch 'master' of git://github.com/RealBadAngel/technic 2013-03-20 10:55:47 -04:00
Vanessa Ezekowitz
6d1e9b4d61 Multiple changes, see below:
removed concrete, marble, marble brick, granite, obsidian

stairs/etc from creative inventory, made them work with circular saw in
moreblocks since this mod depends on that one anyway.  Removed technic obsidian
block entirely and aliased it to the default obsidian block; all stairs/slabs
for obsidian are under the default: namespace.

This depends on a small fix to the circular saw that was just added by
Sokomine.  If your copy of circular saw doesn't have this fix, you can still
use /giveme to get the blocks you need.

Removed custom generate_ore code and made generate-ore calls use
default.generate_ore() since that is the same function anyway.  This is so that
technic can use the C++ version of that function when it is moved back into the
engine.
2013-03-20 10:50:51 -04:00
RealBadAngel
c6da0a6713 Added Forcefield generator by ShadowNinja 2013-03-20 03:46:35 +01:00
RealBadAngel
773382cf2c initial stargate code 2013-03-10 18:37:29 +01:00
Vanessa Ezekowitz
9b54837f99 fixed incorrect dependency for moreblocks/stairsplus
(moreblocks contains stairsplus now)
2013-03-09 13:37:45 -05:00
RealBadAngel
8f485a6ee2 bugfix 2013-03-06 21:51:45 +01:00
RealBadAngel
fa9ff3b851 Update to work with latest Stairsplus 2013-03-06 21:04:35 +01:00
Kyle
985401a23d Avoid a nil index crash 2013-02-21 17:14:38 -08:00
RealBadAngel
1a09ffaf49 Merge pull request #7 from khonkhortisan/master
Keep players from falling through moving frames
2013-02-21 13:15:57 -08:00
RealBadAngel
7904a3a1d3 Merge remote branch 'origin/master' 2013-02-21 22:02:12 +01:00
RealBadAngel
e23f87d20c Reworked power tools, new drills 2013-02-21 22:01:49 +01:00
Kyle
08acacba06 Remove the original only after creating the copy so players don't fall
through moving frames
2013-02-21 11:38:34 -08:00
khonkhortisan
4b0d4ba9ab Rotate frame motor textures
Without adding new images
2013-02-19 19:24:24 -08:00
RealBadAngel
671ba32e5a Fix to last registered power tool not being able to charge (affected blue energy crystal) 2013-02-19 23:11:41 +01:00
RealBadAngel
4a5877a2bc Nore's update to frames 2013-02-17 19:31:12 +01:00
RealBadAngel
d037d26bc7 fix to water mill 2013-02-13 00:27:19 +01:00
Sdzen Boco
60d394e0d4 more textures 2013-02-08 21:14:01 -05:00
RealBadAngel
478407f0a3 Nore's frames code with nodebox frames 2013-02-06 15:34:01 +01:00
RealBadAngel
a2aef2a7af Update LV grinder code 2013-02-04 03:53:54 +01:00
RealBadAngel
86f39a0d96 new 32x lv,mv and hv textures 2013-02-04 03:04:12 +01:00
RealBadAngel
6123493fd7 Added API functions to register LV and MV machines 2013-02-03 19:28:51 +01:00
RealBadAngel
5d799eb94f added MV Alloy Furnace 2013-02-03 17:56:52 +01:00
RealBadAngel
e8fea5f41d add MV alloy furnace textures 2013-02-03 16:07:02 +01:00
RealBadAngel
fd26a83fcf Injector upgrade 2013-02-03 14:59:40 +01:00
RealBadAngel
4cefe5c544 better Control Logic Unit textures 2013-02-03 13:52:17 +01:00
RealBadAngel
c93bf21e9c update to some 32x textures 2013-02-03 13:44:38 +01:00
RealBadAngel
91cdd1694a Added crafting recipe for Injector 2013-02-03 13:02:22 +01:00
RealBadAngel
74cf4746be Added Injector 2013-02-03 12:56:23 +01:00
RealBadAngel
4411ba6e03 added tubes crafting recipes 2013-02-03 11:53:19 +01:00
RealBadAngel
e83a4c652f added mv furnace to PR list 2013-02-03 10:23:55 +01:00
RealBadAngel
b55bae95d8 Added fully functional MV electric furnace 2013-02-03 02:17:22 +01:00
RealBadAngel
3b5e6ca05a Added item - Control Logic Unit 2013-02-02 21:26:34 +01:00
RealBadAngel
fdc0562b3a Fixes to deployer 2013-02-02 20:42:07 +01:00
RealBadAngel
661f21754a readded sounds 2013-02-02 09:39:39 +01:00
RealBadAngel
061e6bbadc Re-added Deployer
Initial code of MV furnace
2013-02-01 00:28:22 +01:00
RealBadAngel
86f8e17695 Added MV Electric furnace textures 2013-01-27 21:36:24 +01:00
RealBadAngel
82cba919fa cleanup phase2 2013-01-27 14:03:47 +01:00
RealBadAngel
4c3affecbc cleanup 2013-01-27 14:01:53 +01:00